"MDL-20819, sometimes, modules return non-array which can break stats processing...

diff --git a/lib/statslib.php b/lib/statslib.php
index e175e7087b4515606483da1f19e38f7a70e39239..ab031171a51ebfd8b3cec68be0de594371ffaa4f 100644 (file)
--- a/lib/statslib.php
+++ b/lib/statslib.php
@@ -1287,7 +1287,10 @@ function stats_get_action_names($str) {
         require_once($file);
         $function = $mod->name.'_get_'.$str.'_actions';
         if (function_exists($function)) {
-            $actions = array_merge($actions,$function());
+            $mod_actions = $function();
+            if (is_array($mod_actions)) {
+                $actions = array_merge($actions, $mod_actions);
+            }
         }
     }