Merge branch 'MDL-44560-28' of git://github.com/xow/moodle into MOODLE_28_STABLE

2015-01-20 13:26:02 +08:00
parent 628109a9cf 3bb4665841
commit af152f8d1e
1 changed files with 7 additions and 1 deletions
@@ -267,7 +267,13 @@
        }
    break;
    }
-    $count = $DB->count_records_sql("SELECT COUNT(DISTINCT(ge.id)) $sqlfrom $sqlwhere", $params);
+
+    $count = 0;
+    if ($tab == GLOSSARY_CATEGORY_VIEW && $hook == GLOSSARY_SHOW_ALL_CATEGORIES) {
+        $count = $DB->count_records_sql("SELECT COUNT(ge.id) $sqlfrom $sqlwhere", $params);
+    } else {
+        $count = $DB->count_records_sql("SELECT COUNT(DISTINCT(ge.id)) $sqlfrom $sqlwhere", $params);
+    }

    $limitfrom = $offset;
    $limitnum = 0;