harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #336

Browse Source
This commit is contained in:
redmatrix 2016-03-31 18:53:05 -07:00
parent c0b3d7e1b4
commit 36b388ab8c
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/import.php
View File

@ -636,6 +636,7 @@ function sync_events($channel,$events) {
function import_menus($channel,$menus) { function import_menus($channel,$menus) {
if($channel && $menus) { if($channel && $menus) {
foreach($menus as $menu) { foreach($menus as $menu) {
$m = array(); $m = array();
@ -681,6 +682,8 @@ function import_menus($channel,$menus) {
} }
} }
} }
} }

6
include/menu.php
View File

@ -35,11 +35,11 @@ function menu_element($menu) {
$arr['edited'] = $menu['menu']['menu_edited']; $arr['edited'] = $menu['menu']['menu_edited'];
$arr['baseurl'] = z_root(); $arr['baseurl'] = z_root();
if($menu['menu_flags']) { if($menu['menu']['menu_flags']) {
$arr['flags'] = array(); $arr['flags'] = array();
if($menu['menu_flags'] & MENU_BOOKMARK) if($menu['menu']['menu_flags'] & MENU_BOOKMARK)
$arr['flags'][] = 'bookmark'; $arr['flags'][] = 'bookmark';
if($menu['menu_flags'] & MENU_SYSTEM) if($menu['menu']['menu_flags'] & MENU_SYSTEM)
$arr['flags'][] = 'system'; $arr['flags'][] = 'system';
} }
if($menu['items']) { if($menu['items']) {

2
util/typohelper.php
View File

@ -1,5 +1,7 @@
<?php <?php
require_once('boot.php');
$str = <<< EOT $str = <<< EOT
error_reporting(E_ERROR | E_WARNING | E_PARSE ); error_reporting(E_ERROR | E_WARNING | E_PARSE );
ini_set('display_errors', '1'); ini_set('display_errors', '1');