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

Change the code in the menu to return immediately if the database object is not ready in this case its not ready until the install.php is finished.

Browse Source
This commit is contained in:
markjcrane
2016-03-26 13:36:00 -06:00
parent 7f64cca1fa
commit c6f0759a5c
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/install.php
-3
View File
@@ -204,9 +204,6 @@
include "resources/page_parts/install_select_language.php"; include "resources/page_parts/install_select_language.php";
echo " <input type='hidden' name='return_install_step' value='select_language'/>\n"; echo " <input type='hidden' name='return_install_step' value='select_language'/>\n";
echo " <input type='hidden' name='install_step' value='detect_config'/>\n"; echo " <input type='hidden' name='install_step' value='detect_config'/>\n";
echo " <div style='text-align:right'>\n";
echo " <input type='submit' class='btn' id='next' value='".$text['button-next']."'>\n";
echo " </div>\n";
echo "</form>\n"; echo "</form>\n";
} elseif($install_step == 'detect_config'){ } elseif($install_step == 'detect_config'){
if(!($event_host == '' || $event_host == 'localhost' || $event_host == '::1' || $event_host == '127.0.0.1' )){ if(!($event_host == '' || $event_host == 'localhost' || $event_host == '::1' || $event_host == '127.0.0.1' )){
resources/classes/menu.php
+10 -12
View File
@@ -386,12 +386,11 @@
//create the menu array //create the menu array
function menu_array($sql, $menu_item_level) { function menu_array($sql, $menu_item_level) {
//get the database connnection return immediately if it doesn't exist //get the database connnection
if ($this->db) { $db = $this->db;
$db = $this->db;
}else { //database ojbect does not exist return immediately
return; if (!$db) { return; }
}
//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'])) {
@@ -460,12 +459,11 @@
//create the sub menus //create the sub menus
function menu_child_array($menu_item_level, $menu_item_uuid) { function menu_child_array($menu_item_level, $menu_item_uuid) {
//get the database connnection return immediately if it doesn't exist //get the database connnection
if ($this->db) { $db = $this->db;
$db = $this->db;
}else { //database ojbect does not exist return immediately
return; if (!$db) { return; }
}
//set the level //set the level
$menu_item_level = $menu_item_level+1; $menu_item_level = $menu_item_level+1;