class.egw_framework.inc.php

ralfbecker_sf 2016-03-03 10:39:33 UTC #1

Author: ralfbecker
New Revision: 55227

URL: http://svn.stylite.de/viewvc/egroupware?rev=55227&view=rev
Log:
fix mail/js/app.min.js was not used and etemplate2.min.js included twice

Modified:
trunk/phpgwapi/inc/class.egw_framework.inc.php

Modified: trunk/phpgwapi/inc/class.egw_framework.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_framework.inc.php?rev=55227&r1=55226&r2=55227&view=diff

— trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Thu Mar 3 11:39:33 2016
@@ -2126,7 +2126,7 @@
_debug_array(array_values($to_include));
die(‘STOP’);*/

```
  return array_values($to_include);
```

```
  return array_values(array_unique($to_include));
```
}

/**
@@ -2158,8 +2158,7 @@
$to_include_first[] = $path . ‘?’ . $mod;
}
// for now minify does NOT support query parameters, nor php files generating javascript

  	elseif ($debug_minify || $query || substr($path, -3) != '.js' ||

  		substr($path, -7) == '/app.js')	// do NOT include app.js, as it changes from app to app

  	elseif ($debug_minify || $query || substr($path, -3) != '.js')
  	{
  		$path .= '?'. $mod.($query ? '&'.$query : '');
  		$to_include[] = $path;

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs