? .svn
? frameworkpatch
? patch.patch
? php5powah_tests.patch
? prefixing.patch
? simpletest
? simpletest_orig
? simplify.patch
Index: drupal_test_case.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/drupal_test_case.php,v
retrieving revision 1.67
diff -u -p -r1.67 drupal_test_case.php
--- drupal_test_case.php	24 Mar 2008 20:52:11 -0000	1.67
+++ drupal_test_case.php	25 Mar 2008 04:52:37 -0000
@@ -358,8 +358,8 @@ class DrupalTestCase extends UnitTestCas
   }
 
   function setUp() {
-    global $db_prefix, $simpletest_ua_handling;
-    if ($simpletest_ua_handling) {
+    global $db_prefix, $simpletest_ua_key;
+    if ($simpletest_ua_key) {
       $this->db_prefix_original = $db_prefix;
       $db_prefix = 'simpletest'. mt_rand(1000, 1000000);
       include_once './includes/install.inc';
Index: simpletest.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpletest/simpletest.module,v
retrieving revision 1.39
diff -u -p -r1.39 simpletest.module
--- simpletest.module	24 Mar 2008 20:12:00 -0000	1.39
+++ simpletest.module	25 Mar 2008 04:52:37 -0000
@@ -83,18 +83,17 @@ function simpletest_load() {
  * Menu callback for both running tests and listing possible tests
  */
 function simpletest_entrypoint() {
-  global $simpletest_ua_handling;
+  global $simpletest_ua_key;
   if (!simpletest_load()) {
      // @TODO - Find a better way for this return.  It is currently needed to show error,
      // and returning true leads to page not found
     return ' ';
   }
-  if (!$simpletest_ua_handling) {
+  if (!$simpletest_ua_key) {
     $output = t('Please add the following code to the bottom of settings.php');
     $output .=
-'<p><code><pre>$GLOBALS["simpletest_ua_handling"] = TRUE;
-$GLOBALS["simpletest_ua_key"] = '. mt_rand(1000, 1000000) .';
-if (preg_match("/(simpletest\d+),(\d+)/", $_SERVER["HTTP_USER_AGENT"], $matches) && $GLOBALS["simpletest_ua_key"] == $matches[2]) {
+'<p><code><pre>$GLOBALS["simpletest_ua_key"] = '. mt_rand(1000, 1000000) .';
+if (preg_match("/^(simpletest\d+),(\d+)/", $_SERVER["HTTP_USER_AGENT"], $matches) && $GLOBALS["simpletest_ua_key"] == $matches[2]) {
   $db_prefix = $matches[1];
 }</pre></code></p>';
     return $output;