summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/clientscripts.php
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web/Javascripts/clientscripts.php')
-rw-r--r--framework/Web/Javascripts/clientscripts.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/Web/Javascripts/clientscripts.php b/framework/Web/Javascripts/clientscripts.php
index 21da56bf..f810901b 100644
--- a/framework/Web/Javascripts/clientscripts.php
+++ b/framework/Web/Javascripts/clientscripts.php
@@ -74,7 +74,7 @@ function get_script_requests($max=25)
*/
function get_package_files($package_file, $request)
{
- list($packages, $dependencies) = @include($package_file);
+ list($packages, $dependencies) = include($package_file);
if(!(is_array($packages) && is_array($dependencies)))
{
error_log('Prado client script: invalid package file '.$package_file);
@@ -240,6 +240,9 @@ function print_headers()
*/
function supports_gzip_encoding()
{
+ if(isset($_GET['gzip']) && $_GET['gzip']==='false')
+ return false;
+
if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
{
$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));