Changeset 1020

Show
Ignore:
Timestamp:
03/28/2008 05:05:27 PM (15 months ago)
Author:
BrianKoontz
Message:

Modification to prevent setup wizard from being invoked when versions
are appended with -<string> or _<string> (such as "trunk-r1019").
Refs #719

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/wikka.php

    r901 r1020  
    801801        $wakkaConfig['wakka_version'] = 0; 
    802802} 
    803 if ($wakkaConfig['wakka_version'] !== WAKKA_VERSION) 
     803$version = array(); 
     804// We are interested in the version root (i.e., given "trunk-r1009" or 
     805// "trunk_r1009", we only want to compare against "trunk") 
     806$version = preg_split('/-|_/', WAKKA_VERSION); 
     807if ($wakkaConfig['wakka_version'] !== $version[0]) 
    804808{ 
    805809        // set up (intended) config location for the installer