Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/api.php b/lib/api.php
index b987badc0..5758cc874 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -1322,4 +1322,22 @@ class ApiAction extends Action
         }
     }
 
+    function getSelfUri($action, $aargs)
+    {
+        parse_str($_SERVER['QUERY_STRING'], $params);
+        $pstring = '';
+        if (!empty($params)) {
+            unset($params['p']);
+            $pstring = http_build_query($params);
+        }
+
+        $uri = common_local_url($action, $aargs);
+
+        if (!empty($pstring)) {
+            $uri .= '?' . $pstring;
+        }
+
+        return $uri;
+    }
+
 }