From: Sébastien SAUVAGE Date: Mon, 11 Mar 2013 09:11:47 +0000 (-0700) Subject: Merge pull request #43 from dsferruzza/highlight-search-results X-Git-Tag: v0.0.42beta~24 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=99954e12900401c5c725e65bce28cc1711653e45;hp=9da49531909101fd944d922a465f651c6f7b5935;p=github%2Fshaarli%2FShaarli.git Merge pull request #43 from dsferruzza/highlight-search-results Highlight search results --- diff --git a/.gitignore b/.gitignore index f40099f5..bcd745e4 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 diff --git a/index.php b/index.php index adc11f9b..1d13e55c 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 @@ -1979,7 +1985,6 @@ function lazyThumbnail($url,$href=false) else $html.=' {include="page.footer"} - + {if="empty($GLOBALS['disablejquery'])"} {/if} + \ No newline at end of file