extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 06:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed since r39109 (merge for filemanager) not working install

Browse Source
This commit is contained in:
Ralf Becker 2012-05-11 08:35:32 +00:00
parent 84bc15ebba
commit 5cafed6381
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
filemanager/inc/class.filemanager_hooks.inc.php
View File

@ -6,7 +6,7 @@
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package filemanager
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id: class.filemanager_hooks.inc.php 25002 2008-03-03 12:16:11Z ralfbecker $
* @version $Id$
*/
/**
@ -212,7 +212,6 @@ class filemanager_hooks
'forced' => 'yes',
),
);
{
$link = egw::link('/index.php','menuaction=filemanager.filemanager_merge.show_replacements');
$settings['default_document'] = array(
@ -240,7 +239,7 @@ class filemanager_hooks
'admin' => False,
'default' => '/templates/filemanager',
);
}
// Import / Export for nextmatch
if ($GLOBALS['egw_info']['user']['apps']['importexport'])
{

2
phpgwapi/inc/class.egw.inc.php
View File

@ -622,6 +622,8 @@ class egw_minimal
switch($name)
{
case 'framework':
// default to idots, if no template_set set, to eg. not stall installations if settings use egw::link
if (empty($GLOBALS['egw_info']['server']['template_set'])) $GLOBALS['egw_info']['server']['template_set'] = 'idots';
// setup the new eGW framework (template sets)
$class = $GLOBALS['egw_info']['server']['template_set'].'_framework';
if (!class_exists($class)) // first try to autoload the class