From: Marcus Campbell Date: Sat, 9 Dec 2006 06:13:28 +0000 (+0000) Subject: Merge trunk fix for [ 1480341 ] Timezone Bug X-Git-Url: https://projects.mako.cc/source/scuttle/commitdiff_plain/e3d34a49246237c9dbcb56db37d4f5807f87b01c?ds=inline;hp=-c Merge trunk fix for [ 1480341 ] Timezone Bug Merge trunk fix for [ 1493870 ] Problem with required files in gettext.inc Merge trunk fix for [ 1495135 ] Missing a closing parenthesis in ajaxGetTitle.php Merged trunk changes for .htaccess file --- e3d34a49246237c9dbcb56db37d4f5807f87b01c diff --git a/.htaccess b/.htaccess index c129f69..af3cae9 100644 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,10 @@ Options +FollowSymlinks -AcceptPathInfo On + + AcceptPathInfo On + RewriteEngine On RewriteBase / RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L] +RewriteCond %{REQUEST_FILENAME}.php -f +RewriteRule ^([^/]+)/?(.*) $1.php/$2 [L] diff --git a/ajaxGetTitle.php b/ajaxGetTitle.php index 0bc142d..473fa59 100644 --- a/ajaxGetTitle.php +++ b/ajaxGetTitle.php @@ -40,7 +40,7 @@ function getTitle($url) { $encoding = strtoupper($matches[1][0]); // Convert to UTF-8 from the original encoding - if (function_exists('mb_convert_encoding') { + if (function_exists('mb_convert_encoding')) { $title = @mb_convert_encoding($title, 'UTF-8', $encoding); } diff --git a/includes/php-gettext/gettext.inc b/includes/php-gettext/gettext.inc index eb94b25..21a41cc 100644 --- a/includes/php-gettext/gettext.inc +++ b/includes/php-gettext/gettext.inc @@ -31,9 +31,8 @@ LC_MESSAGES 5 LC_ALL 6 */ -require('streams.php'); -require('gettext.php'); - +require(dirname(__FILE__) .'/streams.php'); +require(dirname(__FILE__) .'/gettext.php'); // Variables diff --git a/rss.php b/rss.php index fc35e40..4db9773 100644 --- a/rss.php +++ b/rss.php @@ -90,7 +90,7 @@ foreach(array_keys($bookmarks_tmp) as $key) { if ($GLOBALS['useredir']) { $_link = $GLOBALS['url_redir'] . $_link; } - $_pubdate = gmdate("r", strtotime($row['bDatetime'])); + $_pubdate = date("r", strtotime($row['bDatetime'])); // array_walk($row['tags'], 'filter'); $bookmarks_tpl[] = array(