Merge branch 'master' of git://github.com/sebsauvage/Shaarli

Conflicts:
	.gitignore

.gitignore

@@ -1,7 +1,10 @@
 # Ignore data/, tmp/, cache/ and pagecache/
-data/
+data
-tmp/
+tmp
-cache/
+cache
-pagecache/
+pagecache
+
+# Eclipse project files
+.settings
+.buildpath
 .project
-.settings/

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
@@ -1990,7 +1996,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']).'"';

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>