From 859a21c8855ccd982a92cc298ff35a48b30c57a5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 24 Jul 2010 01:37:12 +0000
Subject: [PATCH] Fixes for messed up sponsor menu

---
 inc/libs/sponsor_functions.php               | 17 ++++-------------
 templates/de/html/sponsor/sponsor_action.tpl |  2 +-
 templates/de/html/sponsor/sponsor_what.tpl   |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 37c66b190c..757d6880be 100644
--- 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 81feff4569..6e3108b2d1 100644
--- 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 4dceaefee7..57e0cc5fa6 100644
--- 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>
-- 
2.39.5