Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle

diff --git a/admin/modules.php b/admin/modules.php
index 3ecb952..71e22bd 100644 (file)
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -141,12 +141,17 @@
             $settings = "";
         }
 
-        $count = $DB->count_records_select($module->name, "course<>0");
+        try {
+            $count = $DB->count_records_select($module->name, "course<>0");
+        } catch (dml_exception $e) {
+            $count = -1;
+        }
         if ($count>0) {
             $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
                 "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
-        }
-        else {
+        } else if ($count < 0) {
+            $countlink = get_string('error');
+        } else {
             $countlink = "$count";
         }