From 0150726c4bfecd1c1ed76e8bc7fce409c42b5476 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 2 Jun 2010 21:28:51 +0000
Subject: [PATCH] using framework->template_dir, instead of hardcoded phpgwapi
 based one

---
 phpgwapi/inc/class.common.inc.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 87efd7a7b9..b459ff2fd3 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -743,7 +743,14 @@ class common
 	 */
 	static function find_image($appname,$image)
 	{
-		$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+		if ($appname != 'phpgwapi')
+		{
+			$imagedir = $GLOBALS['egw']->framework->template_dir.'/images';
+		}
+		else
+		{
+			$imagedir = '/'.$appname.'/templates/'.$GLOBALS['egw_info']['user']['preferences']['common']['template_set'].'/images';
+		}
 		$vfs_imagedir = $GLOBALS['egw_info']['server']['vfs_image_dir'];
 
 		if (!isset(self::$found_files[$appname]))