From: Preston L. Bannister <pbannister@php.net>
Date: Thu, 16 May 2002 21:56:08 +0000 (+0000)
Subject: Make test valid for either "register globals" setting.
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2c16263e8b530435ba07031c2e35d2c51dd2054;p=php

Make test valid for either "register globals" setting.
---

diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt
index 9320c16c16..8d12ea8da8 100644
--- a/tests/basic/011.phpt
+++ b/tests/basic/011.phpt
@@ -7,15 +7,16 @@ Testing $argc and $argv handling
 ab+cd+ef+123+test
 --FILE--
 <?php 
-	if(ini_get('register_globals') != '') {
-		for($i=0;$i<$argc;$i++) {
-			echo "$i: ".$argv[$i]."\n";
-		}
-	} else {
-		for($i=0;$i<$_SERVER['argc'];$i++) {
-			echo "$i: ".$_SERVER['argv'][$i]."\n";
-		}
-	}
+
+if (!ini_get('register_globals')) {
+	$argc = $_SERVER['argc'];
+	$argv = $_SERVER['argv'];
+}
+
+for ($i=0; $i<$argc; $i++) {
+	echo "$i: ".$argv[$i]."\n";
+}
+
 ?>
 --EXPECT--
 0: ab