mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Merge branch master into dashboard.

Browse Source
This commit is contained in:
lonalore
2016-11-07 16:07:36 +01:00
parent a69a3d7682 2ebd60821d
commit 8258058b22
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_admin/includes/infopanel.php
View File

@@ -263,11 +263,12 @@ class adminstyle_infopanel
{ {
foreach($user_pref['core-infopanel-menus'] as $val) foreach($user_pref['core-infopanel-menus'] as $val)
{ {
// Custom menu. // Custom menu (core).
if(is_numeric($val)) if(is_numeric($val))
{ {
$inc = e107::getMenu()->renderMenu($val, null, null, true); $inc = e107::getMenu()->renderMenu($val, null, null, true);
} }
// Plugin defined menu.
else else
{ {
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); $inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
@@ -688,12 +689,12 @@ class adminstyle_infopanel
{ {
while ($row = e107::getDb()->db_Fetch()) while ($row = e107::getDb()->db_Fetch())
{ {
// Custom menu. // Custom menu (core).
if(is_numeric($row['menu_path'])) if(is_numeric($row['menu_path']))
{ {
$path_to_menu = $row['menu_path']; $path_to_menu = $row['menu_path'];
} }
// Plugin menu. // Plugin defined menu.
else else
{ {
$path_to_menu = $row['menu_path'].$row['menu_name']; $path_to_menu = $row['menu_path'].$row['menu_name'];