merge r12022 from branch 2.2 to trunk

bug 2421 fixed: no more warning on comments.php when $_SERVER['QUERY_STRING'] is not defined git-svn-id: http://piwigo.org/svn/trunk@12023 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Aug 31, 2011 · a4cfa43 · a4cfa43
1 parent 891979d
commit a4cfa43
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -655,6 +655,11 @@ function redirect( $url , $msg = '', $refresh_time = 0)
  */
 function get_query_string_diff($rejects=array(), $escape=true)
 {
+  if (empty($_SERVER['QUERY_STRING']))
+  {
+    return '';
+  }
+
   $query_string = '';
 
   $str = $_SERVER['QUERY_STRING'];