Interface fix: put order into RSS links

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@134 b3834d28-1941-0410-a4f8-b48e95affb8f

diff --git a/.htaccess b/.htaccess
index 8262b680167d37bb6e3857ca73d08074707c0f5e..03aea7edf3894150a3c3dd110f69675a92302eec 100644 (file)
--- 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 61e2aac687de49599a5d4ffcbb7e215fa2ccb2d0..232249fae6ead7ff167939ed1a73cdd389364ed9 100644 (file)
--- 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 b4bbe925f81b404ef8c717076ed7fc4f8550eb49..9684fdf6e0a89d9f660429c690f58132188cd418 100644 (file)
--- 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 e44c592515d63ed80c60dd01ac6652a1a517f47a..599b6fb7b49bb34d111c44ce33077a6e39a6707a 100644 (file)
--- 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