bump version to 14.2 and change dependency check from == to >=, like it is used every where else

This commit is contained in:
Ralf Becker 2014-12-10 09:10:55 +00:00
parent afcad4b50f
commit 494a87af52
3 changed files with 11 additions and 2 deletions

View File

@ -12,7 +12,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'EGroupware API'; $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']['versions']['current_header'] = '1.29';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;

View File

@ -46,3 +46,12 @@ function phpgwapi_upgrade14_1()
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.1.900'; 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';
}

View File

@ -181,7 +181,7 @@ class setup_detection
$currentver = '0.9.14.508'; $currentver = '0.9.14.508';
} }
$major = $GLOBALS['egw_setup']->get_major($currentver); $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; $setup_info['depends'][$depkey]['status'] = True;
} }