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

2010-02-12 11:18:35 -08:00
parent 3c79448cd8 fd3c9334bf
commit 122c8677b7
45 changed files with 3007 additions and 581 deletions
--- 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;
+    }
+
 }