copy args function

darcs-hash:20080619141107-84dde-a5e018fdac3f72eee13b3093fbd871299cda0739.gz

diff --git a/lib/action.php b/lib/action.php
index a4cae7066c0e06b34ccf3012d151333498b46993..06d3901d1439e6e9b90acca2710df6ca3e179f59 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -40,11 +40,7 @@ class Action { // lawsuit
        }
        
        function handle($argarray) {
-               $strip = get_magic_quotes_gpc();
-               $this->args = array();
-               foreach ($argarray as $k => $v) {
-                       $this->args[$k] = ($strip) ? stripslashes($v) : $v;
-               }
+               $this->args =& common_copy_args($argarray);
        }
        
        function boolean($key, $def=false) {

diff --git a/lib/openid.php b/lib/openid.php
index d044aa762484586ba3258f91aa9407c8d4d085bf..9adf8e9f71c1762d644c96e2329b9ada526e0cf9 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -95,7 +95,7 @@ function oid_get_user($openid_url) {
 function oid_check_immediate($openid_url, $backto=NULL) {
        if (!$backto) {
                $action = $_REQUEST['action'];
-               $args = clone($_GET);
+               $args = common_copy_args($_GET);
                unset($args['action']);
                $backto = common_local_url($action, $args);
        }

diff --git a/lib/util.php b/lib/util.php
index eb019ac7ee849f97d243295c0ce164f7da293773..a4c30cbe4edb001a024b099762acda75517197a3 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -887,3 +887,12 @@ function common_config($main, $sub) {
        global $config;
        return $config[$main][$sub];
 }
+
+function common_copy_args($from) {
+       $to = array();
+       $strip = get_magic_quotes_gpc();
+       foreach ($from as $k => $v) {
+               $to[$k] = ($strip) ? stripslashes($v) : $v;
+       }
+       return $to;
+}
\ No newline at end of file