mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Upgrade - CLI (Manual & Menu): Mitigate PHP 8.x warnings, minor adjustments.
This commit is contained in:
@@ -599,6 +599,10 @@ if (!class_exists('domains')) {
|
||||
*/
|
||||
public function upgrade() {
|
||||
|
||||
//add multi-lingual support
|
||||
$language = new text;
|
||||
$text = $language->get(null, 'core/upgrade');
|
||||
|
||||
//includes files
|
||||
require dirname(__DIR__, 2) . "/resources/require.php";
|
||||
|
||||
@@ -652,6 +656,13 @@ if (!class_exists('domains')) {
|
||||
$domains_processed++;
|
||||
}
|
||||
|
||||
//output result
|
||||
if (defined('STDIN')) {
|
||||
if ($domains_processed > 1) {
|
||||
echo $text['message-upgrade_apps']."\n";
|
||||
}
|
||||
}
|
||||
|
||||
} //end upgrade method
|
||||
|
||||
/**
|
||||
|
||||
@@ -756,7 +756,7 @@ if (!class_exists('menu')) {
|
||||
$sql .= "and menu_item_uuid is not null ";
|
||||
$sql .= ") ";
|
||||
$sql .= "order by i.menu_item_order asc ";
|
||||
$parameters['menu_language'] = $_SESSION['domain']['language']['code'];
|
||||
$parameters['menu_language'] = $_SESSION['domain']['language']['code'] ?? null;
|
||||
$parameters['menu_uuid'] = $this->menu_uuid;
|
||||
$database = new database;
|
||||
$result = $database->select($sql, $parameters, 'all');
|
||||
|
||||
Reference in New Issue
Block a user