merge from trunk(revision 23607:23739) to 1.4 branch

This commit is contained in:
Lars Kneschke 2007-04-30 10:29:15 +00:00
parent 4186439f0a
commit 78b2c22e89
2 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@
$lines = $GLOBALS['egw']->network->gethttpsocketfile('http://www.egroupware.org/currentversion'); $lines = $GLOBALS['egw']->network->gethttpsocketfile('http://www.egroupware.org/currentversion');
for($i=0; $i<count($lines); $i++) for($i=0; $i<count($lines); $i++)
{ {
if(strstr($lines[$i],'currentversion')) if(strpos($lines[$i],'currentversion') !== false)
{ {
$line_found = explode(':',chop($lines[$i])); $line_found = explode(':',chop($lines[$i]));
} }

View File

@ -14,7 +14,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['home']['name'] = 'home'; $setup_info['home']['name'] = 'home';
$setup_info['home']['title'] = 'Home'; $setup_info['home']['title'] = 'Home';
$setup_info['home']['version'] = '1.2'; $setup_info['home']['version'] = '1.4';
$setup_info['home']['app_order'] = 1; $setup_info['home']['app_order'] = 1;
$setup_info['home']['enable'] = 1; $setup_info['home']['enable'] = 1;