[5123] trunk/htdocs/system/classes/formui.php: $_SERVER['QUERY_STRING'] appears to always be set, but not necesarily empty.

[s...@habariproject.org]

Revision

5123

Author

lildude

Date

2011-05-13 08:48:12 +0000 (Fri, 13 May 2011)

Log Message

$_SERVER['QUERY_STRING'] appears to always be set, but not necesarily empty.  Change to check it is empty before appending query string.

Modified Paths

• trunk/htdocs/system/classes/formui.php

Diff

Modified: trunk/htdocs/system/classes/formui.php (5122 => 5123)

--- trunk/htdocs/system/classes/formui.php	2011-05-12 01:30:46 UTC (rev 5122)
+++ trunk/htdocs/system/classes/formui.php	2011-05-13 08:48:12 UTC (rev 5123)
@@ -554,12 +554,12 @@
 			else {
 				$forvalidation = true;
 				if ( !isset( $_SESSION['forms'][$this->salted_name()]['url'] ) ) {
-					$_SESSION['forms'][$this->salted_name()]['url'] = Site::get_url( 'habari', true ) . Controller::get_stub() . ( isset( $_SERVER['QUERY_STRING'] ) ? '?' . $_SERVER['QUERY_STRING'] : '' );
+					$_SESSION['forms'][$this->salted_name()]['url'] = Site::get_url( 'habari', true ) . Controller::get_stub() . ( empty( $_SERVER['QUERY_STRING'] ) ? '' : '?' . $_SERVER['QUERY_STRING'] );
 				}
 			}
 		}
 		else {
-			$_SESSION['forms'][$this->salted_name()]['url'] = Site::get_url( 'habari', true ) . Controller::get_stub() . ( isset( $_SERVER['QUERY_STRING'] ) ? '?' . $_SERVER['QUERY_STRING'] : '' );
+			$_SESSION['forms'][$this->salted_name()]['url'] = Site::get_url( 'habari', true ) . Controller::get_stub() . ( empty( $_SERVER['QUERY_STRING'] ) ? '' : '?' . $_SERVER['QUERY_STRING'] );
 		}
 		if ( isset( $_SESSION['forms'][$this->salted_name()]['error_data'] ) ) {
 			foreach ( $_SESSION['forms'][$this->salted_name()]['error_data'] as $key => $value ) {