From: Bharat M. <bh...@us...> - 2004-02-16 08:18:40
|
Update of /cvsroot/gallery/gallery2/setup/phpunit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10587/setup/phpunit Modified Files: GalleryTestCase.class index.php Log Message: Removed references to old style HTTP_XXX_VARS and replaced them with _XXX superglobals instead Index: GalleryTestCase.class =================================================================== RCS file: /cvsroot/gallery/gallery2/setup/phpunit/GalleryTestCase.class,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- GalleryTestCase.class 14 Feb 2004 07:22:57 -0000 1.27 +++ GalleryTestCase.class 16 Feb 2004 08:10:45 -0000 1.28 @@ -43,17 +43,14 @@ function setUp() { global $gallery; - global $HTTP_GET_VARS; - global $HTTP_POST_VARS; - global $HTTP_POST_FILES; parent::setUp(); /* Clear out any request vars */ - $this->_saveRequestVars = array($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_POST_FILES); - $HTTP_GET_VARS = array(); - $HTTP_POST_VARS = array(); - $HTTP_POST_FILES = array(); + $this->_saveRequestVars = array($_GET, $_POST, $_FILES); + $_GET = array(); + $_POST = array(); + $_FILES = array(); /* * Try to ensure enough time for this test to complete. If a test @@ -82,9 +79,6 @@ function tearDown() { global $gallery; - global $HTTP_GET_VARS; - global $HTTP_POST_VARS; - global $HTTP_POST_FILES; /* Make sure we're not hanging onto any locks */ $lockIds = GalleryCoreApi::getLockIds(); @@ -100,7 +94,7 @@ } /* Restore form vars */ - list ($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_POST_FILES) = $this->_saveRequestVars; + list ($_GET, $_POST, $_FILES) = $this->_saveRequestVars; /* Restore user id */ $gallery->setActiveUserId($this->_saveUserId); Index: index.php =================================================================== RCS file: /cvsroot/gallery/gallery2/setup/phpunit/index.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- index.php 14 Feb 2004 07:22:57 -0000 1.23 +++ index.php 16 Feb 2004 08:10:45 -0000 1.24 @@ -5,8 +5,6 @@ require_once('GalleryControllerTestCase.class'); function GalleryMain(&$testSuite, $filter) { - global $HTTP_GET_VARS; - $ret = GalleryInitFirstPass(); if ($ret->isError()) { return $ret->wrap(__FILE__, __LINE__); @@ -112,8 +110,8 @@ return GalleryStatus::success(); } -if (isset($HTTP_GET_VARS['filter'])) { - $filter = $HTTP_GET_VARS['filter']; +if (isset($_GET['filter'])) { + $filter = $_GET['filter']; } else { $filter = null; } |