Merge branch 'QA_4_7'

2017-07-10 15:27:44 +02:00 · 2017-07-10 15:27:44 +02:00 · b0393ce823
commit b0393ce823
parent dc420e2872 59d0a9fe86
1 changed files with 7 additions and 0 deletions
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@ -2384,6 +2384,13 @@ class Util
        $classes = array()
    ) {

+        // This is often coming from $cfg['MaxTableList'] and
+        // people sometimes set it to empty string
+        $max_count = intval($max_count);
+        if ($max_count <= 0) {
+            $max_count = 250;
+        }
+
        $class = $frame == 'frame_navigation' ? ' class="ajax"' : '';

        $list_navigator_html = '';