From cb49ab945f9fe33d2ceb05c97bc2ddbdbcccc7c2 Mon Sep 17 00:00:00 2001 From: Mathieu Chabanon Date: Sun, 10 Mar 2013 14:06:12 +0100 Subject: [PATCH 1/4] Avoid a strict standard error when php.ini do not define the default timezone. --- index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/index.php b/index.php index adc11f9..9b628c6 100644 --- 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 From 6e330f2225c41cee4a8296913b1c02cf9b380212 Mon Sep 17 00:00:00 2001 From: Mathieu Chabanon Date: Sun, 10 Mar 2013 14:16:29 +0100 Subject: [PATCH 2/4] Ingore Eclipse project files --- .gitignore | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f40099f..bcd745e 100644 --- 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 From a908244cc42019b6b7cbba260a21a0c3b804945b Mon Sep 17 00:00:00 2001 From: David Sferruzza Date: Sun, 10 Mar 2013 19:03:34 +0100 Subject: [PATCH 3/4] Fix bug producing invalid HTML --- index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/index.php b/index.php index adc11f9..4c3a3a4 100644 --- a/index.php +++ b/index.php @@ -1979,7 +1979,6 @@ function lazyThumbnail($url,$href=false) else $html.=' Date: Sun, 10 Mar 2013 19:04:48 +0100 Subject: [PATCH 4/4] Move lazyload init inside the body tag --- tpl/picwall.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tpl/picwall.html b/tpl/picwall.html index 8f8e0a0..631e086 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html @@ -17,7 +17,7 @@ {include="page.footer"} - + {if="empty($GLOBALS['disablejquery'])"} {/if} + \ No newline at end of file