From c16dce00aeca198ba910840608ef6ccfb656f20f Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Thu, 1 Dec 2011 17:15:52 +0000 Subject: [PATCH] - Bug ! Incorrectly appending a parameter ?version= to linked scripts already containing a parameter in their URL ! - changed the parameter name to itopversion to avoid collisions SVN:trunk[1701] --- application/itopwebpage.class.inc.php | 6 +++--- application/webpage.class.inc.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index 3683ff3ba..4ccdc11ed 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -593,13 +593,13 @@ EOF { // Make sure that the URL to the script contains the application's version number // so that the new script do NOT get reloaded from the cache when the application is upgraded - if (strpos('?', $s_script) === false) + if (strpos($s_script, '?') === false) { - $s_script .= "?version=".ITOP_VERSION; + $s_script .= "?itopversion=".ITOP_VERSION; } else { - $s_script .= "&version=".ITOP_VERSION; + $s_script .= "&itopversion=".ITOP_VERSION; } echo "\n"; } diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php index b762c9195..5246653b3 100644 --- a/application/webpage.class.inc.php +++ b/application/webpage.class.inc.php @@ -372,13 +372,13 @@ class WebPage { // Make sure that the URL to the script contains the application's version number // so that the new script do NOT get reloaded from the cache when the application is upgraded - if (strpos('?', $s_script) === false) + if (strpos($s_script, '?') === false) { - $s_script .= "?version=".ITOP_VERSION; + $s_script .= "?itopversion=".ITOP_VERSION; } else { - $s_script .= "&version=".ITOP_VERSION; + $s_script .= "&itopversion=".ITOP_VERSION; } echo "\n"; }