appdb/ ./objectManager.php include/testData.php

[WineHQ]

ChangeSet ID:	31269
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner(a)winehq.org	2007/07/23 19:30:04

Modified files:
	.              : objectManager.php 
	include        : testData.php 

Log message:
	Edwin Smulders <edwin.smulders(a)gmail.com>
	Switch to using $_SERVER variables from what appears to be deprecated super globals

Patch: http://cvs.winehq.org/patch.py?id=31269

Old revision  New revision  Changes     Path
 1.16          1.17          +3 -3       appdb/objectManager.php
 1.70          1.71          +1 -1       appdb/include/testData.php

Index: appdb/objectManager.php
diff -u -p appdb/objectManager.php:1.16 appdb/objectManager.php:1.17
--- appdb/objectManager.php:1.16	24 Jul 2007  0:30: 4 -0000
+++ appdb/objectManager.php	24 Jul 2007  0:30: 4 -0000
@@ -85,7 +85,7 @@ if($oObject->iId)
         break;
 
         case "edit":
-        $oObject->display_entry_for_editing($REQUEST_URI, $sErrors);
+        $oObject->display_entry_for_editing($_SERVER['REQUEST_URI'], $sErrors);
         break;
 
         case "showMoveChildren":
@@ -93,12 +93,12 @@ if($oObject->iId)
         break;
 
         default:
-        $oObject->view($REQUEST_URI);
+        $oObject->view($_SERVER['REQUEST_URI']);
         break;
     }
 } else if ($aClean['sAction'] == "add")
 {
-    $oObject->add_entry($REQUEST_URI, $sErrors);
+    $oObject->add_entry($_SERVER['REQUEST_URI'], $sErrors);
 } else
 {
     // if displaying a queue display the help for the given queue
Index: appdb/include/testData.php
diff -u -p appdb/include/testData.php:1.70 appdb/include/testData.php:1.71
--- appdb/include/testData.php:1.70	24 Jul 2007  0:30: 4 -0000
+++ appdb/include/testData.php	24 Jul 2007  0:30: 4 -0000
@@ -567,7 +567,7 @@ class testData{
 
         echo '<br />',"\n"; // put a space after the test results table and the button
 
-        echo '<form method=get action="'.$PHP_SELF.'">'."\n";
+        echo '<form method=get action="'.$_SERVER['PHP_SELF'].'">'."\n";
         echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n";
         if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll))
             echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n";