From 5cafed638188707579a475b8c08af7bcd8a02bef Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 11 May 2012 08:35:32 +0000
Subject: [PATCH] fixed since r39109 (merge for filemanager) not working
 install

---
 .../inc/class.filemanager_hooks.inc.php       | 57 +++++++++----------
 phpgwapi/inc/class.egw.inc.php                |  2 +
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index 5b4992969a..1f063d1e10 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -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,35 +212,34 @@ class filemanager_hooks
 				'forced'   => 'yes',
 			),
 		);
-		{
-			$link = egw::link('/index.php','menuaction=filemanager.filemanager_merge.show_replacements');
+		$link = egw::link('/index.php','menuaction=filemanager.filemanager_merge.show_replacements');
+
+		$settings['default_document'] = array(
+			'type'   => 'input',
+			'size'   => 60,
+			'label'  => 'Default document to insert entries',
+			'name'   => 'default_document',
+			'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('timesheet')).' '.
+				lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>', 'name').' '.
+				lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+			'run_lang' => false,
+			'xmlrpc' => True,
+			'admin'  => False,
+		);
+		$settings['document_dir'] = array(
+			'type'   => 'input',
+			'size'   => 60,
+			'label'  => 'Directory with documents to insert entries',
+			'name'   => 'document_dir',
+			'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('timesheet')).' '.
+				lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>','name').' '.
+				lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
+			'run_lang' => false,
+			'xmlrpc' => True,
+			'admin'  => False,
+			'default' => '/templates/filemanager',
+		);
 
-			$settings['default_document'] = array(
-				'type'   => 'input',
-				'size'   => 60,
-				'label'  => 'Default document to insert entries',
-				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('timesheet')).' '.
-					lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>', 'name').' '.
-					lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
-				'run_lang' => false,
-				'xmlrpc' => True,
-				'admin'  => False,
-			);
-			$settings['document_dir'] = array(
-				'type'   => 'input',
-				'size'   => 60,
-				'label'  => 'Directory with documents to insert entries',
-				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('timesheet')).' '.
-					lang('The document can contain placeholder like {{%3}}, to be replaced with the data (%1full list of placeholder names%2).','<a href="'.$link.'" target="_blank">','</a>','name').' '.
-					lang('The following document-types are supported:'). implode(',',bo_merge::get_file_extensions()),
-				'run_lang' => false,
-				'xmlrpc' => True,
-				'admin'  => False,
-				'default' => '/templates/filemanager',
-			);
-		}
 		// Import / Export for nextmatch
 		if ($GLOBALS['egw_info']['user']['apps']['importexport'])
 		{
diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 972f6c3660..d9d1f71217 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -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