diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php index e2bd98ce27..f83ef34bfb 100755 --- a/phpgwapi/setup/setup.inc.php +++ b/phpgwapi/setup/setup.inc.php @@ -12,7 +12,7 @@ /* Basic information about this app */ $setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['title'] = 'EGroupware API'; -$setup_info['phpgwapi']['version'] = '14.1.900'; +$setup_info['phpgwapi']['version'] = '14.2'; $setup_info['phpgwapi']['versions']['current_header'] = '1.29'; $setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['app_order'] = 1; diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index 4e029fc801..9abeec373b 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -46,3 +46,12 @@ function phpgwapi_upgrade14_1() return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.1.900'; } +/** + * Bump version to 14.2 + * + * @return string + */ +function phpgwapi_upgrade14_1_900() +{ + return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.2'; +} \ No newline at end of file diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php index 1349755a0e..7a6edd04d6 100755 --- a/setup/inc/class.setup_detection.inc.php +++ b/setup/inc/class.setup_detection.inc.php @@ -181,7 +181,7 @@ class setup_detection $currentver = '0.9.14.508'; } $major = $GLOBALS['egw_setup']->get_major($currentver); - if ($major == $depsvalue || substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.') + if ($major >= $depsvalue || $major == $depsvalue && substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.') { $setup_info['depends'][$depkey]['status'] = True; }