From ed1f368a59c6f980947a285eb90b7c098ca45bbb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 13 Apr 2013 07:17:57 +0000 Subject: [PATCH] allways using filemtime for timestamps appended to urls to force loading of current version, as mixed use of file{c,m}time causes wired errors due to double loading eg. on OS X where they are different --- phpgwapi/inc/class.egw_framework.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index c652250949..b2dbffdef8 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -1250,7 +1250,7 @@ abstract class egw_framework { $query = ''; list($path,$query) = explode('?',$path,2); - $path .= '?'. filectime(EGW_SERVER_ROOT.$path).($query ? '&'.$query : ''); + $path .= '?'. filemtime(EGW_SERVER_ROOT.$path).($query ? '&'.$query : ''); $response->includeCSS($GLOBALS['egw_info']['server']['webserver_url'].$path); } @@ -1262,7 +1262,7 @@ abstract class egw_framework { $query = ''; list($path,$query) = explode('?',$path,2); - $path .= '?'. filectime(EGW_SERVER_ROOT.$path).($query ? '&'.$query : ''); + $path .= '?'. filemtime(EGW_SERVER_ROOT.$path).($query ? '&'.$query : ''); $response->includeScript($GLOBALS['egw_info']['server']['webserver_url'].$path); } }