summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-14 23:55:10 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-14 23:55:10 -0400
commit7ad2b42bc36a13917666ad69b81cfb779a03a22a (patch)
treefdf99b9cc9df01c58a8c0f9ddfdb1461b7e7e0a9
parent83e303fe270fa86fc0a289cf141a103f5bfd3787 (diff)
before and after are switched, pass QSA in some rewrite rules
darcs-hash:20080615035510-84dde-3026b20678070004d8e8439d5e08e01ee6ef2b8b.gz
-rw-r--r--htaccess.sample4
-rw-r--r--lib/util.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/htaccess.sample b/htaccess.sample
index 604326fe8..92edce2f4 100644
--- 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 1c6bbaf16..169a23853 100644
--- 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');
}