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

Issue #1109, Fixes #830, Fixes #731, Fixes #710, Fixes #608, Fixes #1012 : v1 -> v2 Upgrade-Routine fixes (including forum plugin)

Browse Source
This commit is contained in:
Cameron
2015-08-24 17:39:28 -07:00
parent 29b405d31d
commit cffb369751
18 changed files with 265 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1485,7 +1485,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
if(varset($plug_vars['adminLinks']['link']))
{
if($row['plugin_category'] == 'menu' || !vartrue($plug_vars['adminLinks']['link'][0]['@attributes']['url']))
if(!empty($row['plugin_category']) && $row['plugin_category'] == 'menu' || !vartrue($plug_vars['adminLinks']['link'][0]['@attributes']['url']))
{
continue;
}
@@ -1511,7 +1511,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$tmp[$id]['perm'] = 'P'.$row['plugin_id'];
$tmp[$id]['sub_class'] = '';
$tmp[$id]['sort'] = 2;
$tmp[$id]['category'] = $row['plugin_category'];
$tmp[$id]['category'] = varset($row['plugin_category']);
if($pref['admin_slidedown_subs'] && vartrue($plug_vars['adminLinks']['link']) )
{
@@ -1570,9 +1570,13 @@ Inverse 10 <span class="badge badge-inverse">10</span>
foreach($tmp as $pg)
{
$id = $convert[$pg['category']][1];
$menu_vars[$id]['sub'][] = $pg;
if(!empty($pg['category']))
{
$id = $convert[$pg['category']][1];
$menu_vars[$id]['sub'][] = $pg;
}
}
unset($menu_vars['plugMenu']);