From 1bac324072a2d8d53b7e8c038d781b0af21eb99e Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 13 Nov 2009 12:26:24 +0000
Subject: Moved class="pagination" to child element and removed element

---
 lib/action.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index 80f398fbd..b5cf3240c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -1048,8 +1048,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('div', array('class' => 'pagination'));
-            $this->elementStart('dl', null);
+            $this->elementStart('dl', 'pagination');
             $this->element('dt', null, _('Pagination'));
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
@@ -1074,7 +1073,6 @@ class Action extends HTMLOutputter // lawsuit
             $this->elementEnd('ul');
             $this->elementEnd('dd');
             $this->elementEnd('dl');
-            $this->elementEnd('div');
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 968058c68b0d23e3dccc85301d78dccf8bcc0ba1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 16 Nov 2009 17:54:34 +0100
Subject: getting arguments for return-to processing

---
 lib/action.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index b5cf3240c..4c1e73564 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -985,6 +985,18 @@ class Action extends HTMLOutputter // lawsuit
      */
 
     function selfUrl()
+    {
+        list($action, $args) = $this->returnToArgs();
+        return common_local_url($action, $args);
+    }
+
+    /**
+     * Returns arguments sufficient for re-constructing URL
+     *
+     * @return array two elements: action, other args
+     */
+
+    function returnToArgs()
     {
         $action = $this->trimmed('action');
         $args   = $this->args;
@@ -998,8 +1010,7 @@ class Action extends HTMLOutputter // lawsuit
         foreach (array_keys($_COOKIE) as $cookie) {
             unset($args[$cookie]);
         }
-
-        return common_local_url($action, $args);
+        return array($action, $args);
     }
 
     /**
-- 
cgit v1.2.3-54-g00ecf