From 0d8de282b239e663d5c4dacef7afade846e5cb23 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 19 Jun 2008 10:11:07 -0400 Subject: [PATCH] copy args function darcs-hash:20080619141107-84dde-a5e018fdac3f72eee13b3093fbd871299cda0739.gz --- lib/action.php | 6 +----- lib/openid.php | 2 +- lib/util.php | 9 +++++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/action.php b/lib/action.php index a4cae7066c..06d3901d14 100644 --- 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 d044aa7624..9adf8e9f71 100644 --- 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 eb019ac7ee..a4c30cbe4e 100644 --- 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