dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1528 from moteus/no_menu_warning

Browse Source 
Fix. warning about using NULL as first argument in `foreach`.
This commit is contained in:
FusionPBX
2016-03-30 08:46:46 -06:00
parent 2786099d11 43a023575a
commit 28afa5ef35
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/menu.php
+2 -1
View File
@@ -390,7 +390,7 @@
$db = $this->db; $db = $this->db;
//database ojbect does not exist return immediately //database ojbect does not exist return immediately
if (!$db) { return; } if (!$db) { return Array(); }
//if there are no groups then set the public group //if there are no groups then set the public group
if (!isset($_SESSION['groups'])) { if (!isset($_SESSION['groups'])) {
@@ -435,6 +435,7 @@
//save the menu into an array //save the menu into an array
$x = 0; $x = 0;
$a = Array();
foreach($result as $row) { foreach($result as $row) {
//add the row to the array //add the row to the array
$a[$x] = $row; $a[$x] = $row;