fix bug when loading graph widget

emoncms · Dec 11, 2017 · 818ae94 · 818ae94
1 parent 85ddc62
commit 818ae94
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/widget/graph_widget.php b/widget/graph_widget.php
@@ -3,12 +3,13 @@
 
 global $session, $mysqli;
 
-if (group_module_installed()) {
+// Check if group module is installed
+$group = false;
+$result = $mysqli->query("SHOW TABLES LIKE 'groups'");
+if ($result->num_rows > 0) {
     require_once "Modules/group/group_model.php";
     $group = new Group($mysqli, null, null, null, null);
 }
-else
-    $group = null;
 
 require_once "Modules/graph/graph_model.php";
 $graph = new Graph($mysqli, $group);
@@ -24,13 +25,5 @@
     }
 }
 
-function group_module_installed() {
-    global $mysqli;
-    $result = $mysqli->query("SHOW TABLES LIKE 'groups'");
-    if ($result->num_rows > 0)
-        return true;
-    else
-        false;
-}
 ?>
 <script>var savedgraphsnamelist = <?php echo json_encode($savedgraphsnamelist); ?>;</script>