aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/import.php3
-rw-r--r--include/menu.php6
-rw-r--r--util/typohelper.php2
3 files changed, 8 insertions, 3 deletions
diff --git a/include/import.php b/include/import.php
index b7ec1c565..9a57012b2 100644
--- a/include/import.php
+++ b/include/import.php
@@ -636,6 +636,7 @@ function sync_events($channel,$events) {
function import_menus($channel,$menus) {
+
if($channel && $menus) {
foreach($menus as $menu) {
$m = array();
@@ -681,6 +682,8 @@ function import_menus($channel,$menus) {
}
}
}
+
+
}
diff --git a/include/menu.php b/include/menu.php
index ca3038946..e8f1d8eb8 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -35,11 +35,11 @@ function menu_element($menu) {
$arr['edited'] = $menu['menu']['menu_edited'];
$arr['baseurl'] = z_root();
- if($menu['menu_flags']) {
+ if($menu['menu']['menu_flags']) {
$arr['flags'] = array();
- if($menu['menu_flags'] & MENU_BOOKMARK)
+ if($menu['menu']['menu_flags'] & MENU_BOOKMARK)
$arr['flags'][] = 'bookmark';
- if($menu['menu_flags'] & MENU_SYSTEM)
+ if($menu['menu']['menu_flags'] & MENU_SYSTEM)
$arr['flags'][] = 'system';
}
if($menu['items']) {
diff --git a/util/typohelper.php b/util/typohelper.php
index 589702a02..2453a5097 100644
--- a/util/typohelper.php
+++ b/util/typohelper.php
@@ -1,5 +1,7 @@
<?php
+ require_once('boot.php');
+
$str = <<< EOT
error_reporting(E_ERROR | E_WARNING | E_PARSE );
ini_set('display_errors', '1');