Fixes for messed up sponsor menu

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 37c66b190c81df5ad65a370cc0d73da52859b12f..757d6880be6c91e5347c1ddf19d71b3d4ab50acf 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -300,21 +300,12 @@ ORDER BY
                                // Load sub menus
                                $SUB = '';
                                while ($content2 = SQL_FETCHARRAY($result_sub)) {
-                                       // Merge both arrays
-                                       $content = merge_array($content, $content2);
-
                                        // Check if current selected menu is matching the loaded one
-                                       if ($current == $content['sub_what']) $content['sub_title'] = '<strong>' . $content['sub_title'] . '</strong>';
-
-                                       // Prepare data for the sub template
-                                       $content = array(
-                                               'what'  => $content['sub_what'],
-                                               'title' => $content['sub_title']
-                                       );
+                                       if ($current == $content2['sub_what']) $content2['sub_title'] = '<strong>' . $content2['sub_title'] . '</strong>';
 
                                        // Load row template
-                                       $SUB .= loadTemplate('sponsor_what', true, $content);
-                               }
+                                       $SUB .= loadTemplate('sponsor_what', true, $content2);
+                               } // END - while
 
                                // Prepare data for the main template
                                $content['menu'] = $SUB;
@@ -328,7 +319,7 @@ ORDER BY
 
                        // Free memory
                        SQL_FREERESULT($result_sub);
-               }
+               } // END - while
        } else {
                // No main menus active
                $OUT .= loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MAIN_MENUS_ACTIVE--}');

diff --git a/templates/de/html/sponsor/sponsor_action.tpl b/templates/de/html/sponsor/sponsor_action.tpl
index 81feff45694305bd658894a5e68cc10811ce4932..6e3108b2d10a67722242e1361106deb252fb3818 100644 (file)
--- a/templates/de/html/sponsor/sponsor_action.tpl
+++ b/templates/de/html/sponsor/sponsor_action.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="sponsor_menu">
 <tr>
   <td class="sponsor_action bottom left right" align="center">
-    <strong>$content[title]</strong>
+    <strong>$content[main_title]</strong>
   </td>
 </tr>
 $content[menu]

diff --git a/templates/de/html/sponsor/sponsor_what.tpl b/templates/de/html/sponsor/sponsor_what.tpl
index 4dceaefee742839204f0e4247104d1da21daec3b..57e0cc5fa666a2f7cbbb9c2d9fd0664e99c46a3a 100644 (file)
--- a/templates/de/html/sponsor/sponsor_what.tpl
+++ b/templates/de/html/sponsor/sponsor_what.tpl
@@ -1,8 +1,8 @@
 <tr>
        <td class="sponsor_what bottom left right">
-               <a class="menu_blur" href="{%url=modules.php?module=sponsor&amp;what=$content[what]%}">
+               <a class="menu_blur" href="{%url=modules.php?module=sponsor&amp;what=$content[sub_what]%}">
                        <strong><big>&middot;</big></strong>
-                       $content[title]
+                       $content[sub_title]
                </a>
        </td>
 </tr>