summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-24 14:02:03 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-24 14:02:03 +0000
commitdbd5b2e2e7e46eda5233d61f01793e41a8d8e6fd (patch)
tree36cc2bc24306895ce5b20353d87156d4eeb6963c /wp-inst/wp-includes/functions.php
parent6c1930bf126a5059115dfe7895ac448b86518c8b (diff)
downloadwordpress-mu-dbd5b2e2e7e46eda5233d61f01793e41a8d8e6fd.tar.gz
wordpress-mu-dbd5b2e2e7e46eda5233d61f01793e41a8d8e6fd.tar.xz
wordpress-mu-dbd5b2e2e7e46eda5233d61f01793e41a8d8e6fd.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@514 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/functions.php')
-rw-r--r--wp-inst/wp-includes/functions.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 4a7e9bb..245599e 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2049,7 +2049,10 @@ add_query_arg(associative_array, oldquery_or_uri)
function add_query_arg() {
$ret = '';
if ( is_array(func_get_arg(0)) ) {
- $uri = @func_get_arg(1);
+ if ( @func_num_args() < 2 )
+ $uri = $_SERVER['REQUEST_URI'];
+ else
+ $uri = @func_get_arg(1);
} else {
if ( @func_num_args() < 3 )
$uri = $_SERVER['REQUEST_URI'];