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

Function fixes for e_navigation. (also corrects issue in admin_menu.php )

Browse Source
This commit is contained in:
Cameron
2012-12-03 04:52:23 -08:00
parent e143292345
commit 7b7ca47d15
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/sitelinks_class.php
View File

@@ -854,7 +854,7 @@ class e_navigation
*/ */
ksort($plugin_array, SORT_STRING); // To FIX, without changing the current key format, sort by 'title' ksort($plugin_array, SORT_STRING); // To FIX, without changing the current key format, sort by 'title'
if($linkStyle == "array") if($linkStyle == "array" || $iconSize == 'assoc')
{ {
return $plugin_array; return $plugin_array;
} }
@@ -862,7 +862,7 @@ class e_navigation
foreach ($plugin_array as $plug_key => $plug_value) foreach ($plugin_array as $plug_key => $plug_value)
{ {
$the_icon = ($iconSize == E_16_PLUGMANAGER) ? $plug_value['icon'] : $plug_value['icon_32']; $the_icon = ($iconSize == E_16_PLUGMANAGER) ? $plug_value['icon'] : $plug_value['icon_32'];
$text .= render_links($plug_value['link'], $plug_value['title'], $plug_value['caption'], $plug_value['perms'], $the_icon, $linkStyle); $text .= $this->renderAdminButton($plug_value['link'], $plug_value['title'], $plug_value['caption'], $plug_value['perms'], $the_icon, $linkStyle);
} }
return $text; return $text;
} }