Index: trunk/admin/install/install_lib.php =================================================================== diff -u -r2000 -r2561 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 2000) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 2561) @@ -15,13 +15,18 @@ function VersionSort($a, $b) { - preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $a, $rets); - $a_version = $rets[1]; - $a_extension = $rets[2]; + if( preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $a, $rets) ) + { + $a_version = $rets[1]; + $a_extension = $rets[2]; + } - preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $b, $rets); - $b_version = $rets[1]; - $b_extension = $rets[2]; + if( preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $b, $rets) ) + { + $b_version = $rets[1]; + $b_extension = $rets[2]; + } + if( !isset($a_version) || !isset($b_version) ) return 0; // not php or sql file if($a_version == $b_version) // got PHP and SQL file for one version { @@ -59,12 +64,14 @@ foreach($upgrades_arr as $file) { - preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $file, $rets); - $a_version = $rets[1]; - - if (ConvertVersion($a_version) > ConvertVersion($version)) { - $version = $a_version; - } + if( preg_match('/inportal_upgrade_v(.*).(php|sql)$/', $file, $rets) ) + { + $a_version = $rets[1]; + + if (ConvertVersion($a_version) > ConvertVersion($version)) { + $version = $a_version; + } + } } return $version;