From f92ab95b10fdc4e14255792c7c46b1f53965da2e Mon Sep 17 00:00:00 2001 From: patdenice Date: Sat, 11 Dec 2010 21:37:44 +0000 Subject: merge r8079, r8080, r8082, r8083, r8084 from trunk to branch 2.1 feature 2057: fetchRemote can send POST data feature 2048: Use POST to send server data feature 2048: add $conf['send_hosting_technical_details'] parameter feature 2057: use $get_data parameter to send GET data. feature 2048: send technical details only to get_version_list.php of PEM API. git-svn-id: http://piwigo.org/svn/branches/2.1@8086 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_url.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/functions_url.inc.php') diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php index fe4e5f5e0..d7d6dfcf3 100644 --- a/include/functions_url.inc.php +++ b/include/functions_url.inc.php @@ -89,7 +89,7 @@ function get_absolute_root_url($with_scheme=true) * @param array params * @return string */ -function add_url_params($url, $params) +function add_url_params($url, $params, $arg_separator='&' ) { if ( !empty($params) ) { @@ -100,11 +100,11 @@ function add_url_params($url, $params) if ($is_first) { $is_first = false; - $url .= ( strpos($url, '?')===false ) ? '?' :'&'; + $url .= ( strpos($url, '?')===false ) ? '?' : $arg_separator; } else { - $url .= '&'; + $url .= $arg_separator; } $url .= $param; if (isset($val)) -- cgit v1.2.3