From b6a2d9591f1893a209462fd02ac6addbc261615f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 24 Oct 2012 06:27:56 +0000
Subject: [PATCH] koping with EGroupware installed direct in docroot
 (webserver_url "", "/" or "http(s)://domain.com/")

---
 phpgwapi/inc/class.egw_framework.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 42a784bb4a..ff9f8930fe 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -756,7 +756,9 @@ abstract class egw_framework
 		}
 		if (!$debug_minify)
 		{
-			$css_file = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?b='.substr($base_path, 1).'&f='.$css_file . '&'.$max_modified;
+			$css_file = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?';
+			if ($base_path && $base_path != '/') $css_file .= 'b='.substr($base_path, 1).'&';
+			$css_file .= 'f='.$css_file . '&'.$max_modified;
 			$css_file = '<link href="'.$css_file.'" type="text/css" rel="StyleSheet" />'."\n";
 		}
 		return array(
@@ -1282,7 +1284,8 @@ abstract class egw_framework
 		{
 			$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
 			if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
-			$files = '/phpgwapi/inc/min/?b='.substr($base_path, 1).'&f='.$files . '&'.$max_modified;
+			$files = '/phpgwapi/inc/min/?'.($base_path && $base_path != '/' ? 'b='.substr($base_path, 1).'&' : '').
+				'f='.$files . '&'.$max_modified;
 			$links .= '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url']. $files.'">'."</script>\n";
 		}
 		return $links."\n";