Merge branch 'QA_4_6'

phpmyadmin · May 11, 2016 · 053b954 · 053b954
2 parents 06da170 + 5653a5e
commit 053b954
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #12225 Use https for documentation links
 - issue #12234 Fix schema export with too many tables
 - issue #12240 Avoid parsing non JSON responses as JSON
+- issue #12244 Avoid using too log URLs when getting javascripts
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php

diff --git a/libraries/Scripts.php b/libraries/Scripts.php
@@ -77,8 +77,9 @@ private function _includeFiles($files)
         }
         $separator = URL::getArgSeparator();
         $static_scripts = '';
-        // Using chunks of 20 files to avoid too long URLs
-        $script_chunks = array_chunk($scripts, 20);
+        // Using chunks of 10 files to avoid too long URLs
+        // as some servers are set to 512 bytes URL limit
+        $script_chunks = array_chunk($scripts, 10);
         foreach ($script_chunks as $script_chunk) {
             $url = 'js/get_scripts.js.php?'
                 . implode($separator, $script_chunk)