Changeset 1025

Timestamp:

03/30/2008 11:23:56 AM (2 years ago)

Author:

BrianKoontz

Message:

Installer was failing when both WAKKA_VERSION and wakka_version were
set to the same annotated trunk-r<ver> format. Refs #719

Files:

• trunk/wikka.php (modified) (1 diff)

trunk/wikka.php

@@ -806 +806 @@
 // "trunk_r1009", we only want to compare against "trunk"). 
 $version1 = preg_split('/-|_/', WAKKA_VERSION);
-$version2 = preg_split('/-|_/', $wakkaConfig['wakka_version']);
+// There is some weirdness with the way PHP either (1) returns from
+// preg_replace when the search string is "0", or (2) a type
+// comparison beetween a string and an integer 0.  In any case, 
+// remove the if clause below at your own risk.
+if(0 === $wakkaConfig['wakka_version'])
+{
+        $version2[0] = $wakkaConfig['wakka_version'];
+}
+else    
+{
+        $version2 = preg_split('/-|_/', $wakkaConfig['wakka_version']);
+}
 if ( $version1[0] !== $version2[0] )
+//if($wakkaConfig['wakka_version'] !== WAKKA_VERSION)
 {
         // set up (intended) config location for the installer
         #$wakkaConfigLocation = SITE_CONFIGFILE;                // @@@ use directly in installer
-if ($debug) echo 'site configuration file (to be) lodated at: '.SITE_CONFIGFILE."<br/>\n";
+        if ($debug) echo 'site configuration file (to be) lodated at: '.SITE_CONFIGFILE."<br/>\n";
         $htaccessLocation = str_replace('\\', '/', dirname(__FILE__)).DIRECTORY_SEPARATOR.'.htaccess';
         #if (file_exists('setup'.DIRECTORY_SEPARATOR.'index.php'))      #89