[Fmsystem-commits] [10551] API: switch for turning off js-combine

[Sigurd Nes]

Revision: 10551
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10551
Author:   sigurdne
Date:     2012-11-28 12:33:31 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
API: switch for turning off js-combine

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.js.inc.php

Modified: trunk/phpgwapi/inc/class.js.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.js.inc.php 2012-11-28 12:31:08 UTC (rev 10550)
+++ trunk/phpgwapi/inc/class.js.inc.php 2012-11-28 12:33:31 UTC (rev 10551)
@@ -128,6 +128,12 @@
                public function get_script_links()
                {
                        $combine = true;
+                       
+                       if 
(isset($GLOBALS['phpgw_info']['server']['no_jscombine']) && 
$GLOBALS['phpgw_info']['server']['no_jscombine'])
+                       {
+                               $combine = false;                       
+                       }
+                       
                        if(ini_get('suhosin.get.max_value_length') && 
ini_get('suhosin.get.max_value_length') < 2000)
                        {
                                $combine = false;