4 files changed, 8 insertions, 4 deletions
diff --git a/.htaccess b/.htaccess
index 8262b68..03aea7e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -24,5 +24,9 @@ RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME}.php -f
-RewriteRule ^([^/]+)/?(.*) $1.php?query=$2 [L,QSA]
+
+#if cleanurls don't work, comment option 1 (by adding # at the beginning) and uncomment option 2:
+RewriteRule ^([^/]+)/?(.*) $1.php?query=$2 [L,QSA]        #option 1
+#RewriteRule ^([^/]+)/?(.*)       $1.php/$2       [L]     #option 2
+
 </IfModule>
diff --git a/bookmarks.php b/bookmarks.php
index 61e2aac..232249f 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -202,7 +202,7 @@ if ($templatename == 'editbookmark.tpl') {
     
     // Set template vars
     $tplVars['rsschannels'] = array(
-        array(filter($sitename .': '. $pagetitle), createURL('rss', filter($user, 'url') . $rssCat))
+        array(filter($sitename .': '. $pagetitle), createURL('rss', filter($user, 'url') . $rssCat.'?sort='.getSortOrder()))
     );
 
     $tplVars['page'] = $page;
diff --git a/index.php b/index.php
index b4bbe92..9684fdf 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ if (isset($_GET['action'])){
 // Header variables
 $tplVars['loadjs'] = true;
 $tplVars['rsschannels'] = array(
-    array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss'))
+    array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss').'?sort='.getSortOrder())
 );
 
 if ($usecache) {
diff --git a/tags.php b/tags.php
index e44c592..599b6fb 100644
--- a/tags.php
+++ b/tags.php
@@ -53,7 +53,7 @@ if ($usecache) {
 $tplVars['pagetitle'] = $pagetitle;
 $tplVars['loadjs'] = true;
 $tplVars['rsschannels'] = array(
-    array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')))
+    array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')).'?sort='.getSortOrder())
 );
 
 // Pagination