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

diff --git a/.htaccess b/.htaccess
index c129f6940b7a1a05a10d3a4673f4454dd675f6bf..af3cae928ef4301806388e4c6425cbda69afb59f 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,10 @@
 Options +FollowSymlinks
-AcceptPathInfo On
+<IfDefine APACHE2>
+    AcceptPathInfo On
+</IfDefine>
 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 0bc142d154fd3f138bab7bf5dff1adbd544f007a..473fa59ba72d3183bbc595ae104bf4203aa95fdf 100644 (file)
--- 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 eb94b256a6bed0b73b56d8d628871df8f0f3fabe..21a41cced353eb594164121e568f6cedde234e25 100644 (file)
--- 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 fc35e40f45109519e4216e5dfc5b96005a08bd9e..4db9773e4d382c83b3b88db92b8292c8ebe071fb 100644 (file)
--- 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(