From 6d905c3341dc3f7d414ade3a0d3dff861748f686 Mon Sep 17 00:00:00 2001
From: rob1n <rob1n@git.wordpress.org>
Date: Sat, 14 Apr 2007 00:11:47 +0000
Subject: [PATCH] trim() question marks *after* concatenating the string. fixes
 #4134

git-svn-id: https://develop.svn.wordpress.org/trunk@5267 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/upload-functions.php | 2 ++
 wp-includes/functions.php     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php
index 45fece481e..75e0b3bdd3 100644
--- a/wp-admin/upload-functions.php
+++ b/wp-admin/upload-functions.php
@@ -355,3 +355,5 @@ function wp_upload_admin_head() {
 		echo "</style>";
 	}
 }
+
+?>
\ No newline at end of file
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index c9d46a67f1..dbd8e0f1bc 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -826,8 +826,8 @@ function add_query_arg() {
 				$ret .= "$k=$v";
 		}
 	}
-	$ret = trim($ret, '?');
 	$ret = $protocol . $base . $ret . $frag;
+	$ret = trim($ret, '?');
 	return $ret;
 }