holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix not working update from 1.6 by running register-all-hooks after restore (old 1.6 wiki_bo::search_link hook can not run in setup, so we need the new hook)

Browse Source
This commit is contained in:
Ralf Becker 2012-04-13 14:33:43 +00:00
parent 747b403973
commit 797a412ec8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.db_backup.inc.php
View File

@ -587,6 +587,9 @@ class db_backup
{
return lang('Restore failed');
}
// search-and-register-hooks
$GLOBALS['egw']->hooks->register_all_hooks();
return '';
}

16
phpgwapi/inc/class.hooks.inc.php
View File

@ -308,17 +308,15 @@ class hooks
*/
function register_all_hooks()
{
$SEP = filesystem_separator();
// deleting hooks, to get ride of no longer existing apps
$this->db->delete($this->table,'1=1',__LINE__,__FILE__);
// deleting hooks of all not longer registered apps
if (($all_apps = array_keys($GLOBALS['egw_info']['apps'])))
// now register all apps using just filesystem data
foreach(scandir(EGW_SERVER_ROOT) as $appname)
{
$this->db->delete($this->table,"hook_appname NOT IN ('".implode("','",$all_apps)."')",__LINE__,__FILE__);
}
// now register the rest again
foreach($GLOBALS['egw_info']['apps'] as $appname => $app)
{
$f = EGW_SERVER_ROOT . $SEP . $appname . $SEP . 'setup' . $SEP . 'setup.inc.php';
if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
$setup_info = array($appname => array());
if(@file_exists($f)) include($f);
// some apps have setup_info for more then themselfs (eg. phpgwapi for groupdav)