aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/config_default.inc.php4
-rw-r--r--include/functions_url.inc.php6
2 files changed, 7 insertions, 3 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 694785bb8..50faea48c 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -485,6 +485,10 @@ $conf['template_force_compile'] = false;
// gives an empty value '' to deactivate
$conf['show_php_errors'] = E_ALL;
+// sends your hosting PHP and MySQL versions to piwigo.org as anonymously as
+// possible, for statistics purpose. No personnal data are transmitted
+$conf['send_hosting_technical_details'] = true;
+
// +-----------------------------------------------------------------------+
// | authentication |
// +-----------------------------------------------------------------------+
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))