before and after are switched, pass QSA in some rewrite rules

darcs-hash:20080615035510-84dde-3026b20678070004d8e8439d5e08e01ee6ef2b8b.gz

diff --git a/htaccess.sample b/htaccess.sample
index 604326fe888aa38c73ba08151e9a93cb39e558ea..92edce2f4ce03f3a3400f5a0006b1d3cfd2d66b6 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,7 +1,7 @@
 RewriteEngine On
 
-RewriteRule ^$ index.php?action=public [L]
-RewriteRule ^rss$ index.php?action=publicrss [L]
+RewriteRule ^$ index.php?action=public [L,QSA]
+RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
 
 RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
 RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]

diff --git a/lib/util.php b/lib/util.php
index 1c6bbaf16ad9ad0b9d539021db73f987f942abf9..169a23853c999720e3315c592fa00b22cbed4b22 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -760,7 +760,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
                                                                                 
                common_element_start('li', 'before');
                common_element('a', array('href' => common_local_url($action, $newargs)),
-                                          _t('« Before'));
+                                          _t('« After'));
                common_element_end('li');
        }
 
@@ -769,7 +769,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
                $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
                common_element_start('li', 'after');
                common_element('a', array('href' => common_local_url($action, $newargs)),
-                                                  _t('After »'));
+                                                  _t('Before »'));
                common_element_end('li');
        }