Merge pull request #43 from dsferruzza/highlight-search-results

Highlight search results

diff --git a/.gitignore b/.gitignore
index f40099f5b45ba40c6f1ddf04f77e20994bc217d5..bcd745e4a00f249a15534c8b7a6be6f474d4f767 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 # Ignore data/, tmp/, cache/ and pagecache/
-data/
-tmp/
-cache/
-pagecache/
+data
+tmp
+cache
+pagecache
+
+# Eclipse project files
+.settings
+.buildpath
+.project
\ No newline at end of file

diff --git a/index.php b/index.php
index adc11f9bc4405087983e996c0ebeebeb75131eb9..1d13e55c2bd43b3a51aa5414c8316dcab665c877 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,6 +4,12 @@
 // http://sebsauvage.net/wiki/doku.php?id=php:shaarli
 // Licence: http://www.opensource.org/licenses/zlib-license.php
 // Requires: php 5.1.x  (but autocomplete fields will only work if you have php 5.2.x)
+// -----------------------------------------------------------------------------------------------
+// NEVER TRUST IN PHP.INI
+// Some hosts do not define a default timezone in php.ini,
+// so we have to do this for avoid the strict standard error.
+date_default_timezone_set('UTC');
+
 // -----------------------------------------------------------------------------------------------
 // Hardcoded parameter (These parameters can be overwritten by creating the file /config/options.php)
 $GLOBALS['config']['DATADIR'] = 'data'; // Data subdirectory
@@ -1979,7 +1985,6 @@ function lazyThumbnail($url,$href=false)
     else
         $html.='<img class="lazyimage" src="#" data-original="'.htmlspecialchars($t['src']).'"';
 
-    $html.='<img class="lazyimage" src="#" data-original="'.htmlspecialchars($t['src']).'"';
     if (!empty($t['width']))  $html.=' width="'.htmlspecialchars($t['width']).'"';
     if (!empty($t['height'])) $html.=' height="'.htmlspecialchars($t['height']).'"';
     if (!empty($t['style']))  $html.=' style="'.htmlspecialchars($t['style']).'"';

diff --git a/tpl/picwall.html b/tpl/picwall.html
index 8f8e0a0eed56b7b6671706e15f4fc8cb4130c0a4..631e0866b4c4c5f03ae60d0adfb79efea891cccb 100644 (file)
--- a/tpl/picwall.html
+++ b/tpl/picwall.html
@@ -17,7 +17,7 @@
 </div>
 </center>
 {include="page.footer"}
-</body>
+
 {if="empty($GLOBALS['disablejquery'])"} 
 <script>
 $(document).ready(function() {
@@ -25,4 +25,5 @@ $(document).ready(function() {
 });
 </script>
 {/if} 
+</body>
 </html>
\ No newline at end of file