From 16af1a3b11a2f7ed62ac1fcae2c53d7a356bf135 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Fri, 10 May 2013 02:46:09 -0700
Subject: [PATCH] Removed commented-out code.

---
 e107_handlers/menu_class.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php
index 4b01f392a..65dba9f55 100644
--- a/e107_handlers/menu_class.php
+++ b/e107_handlers/menu_class.php
@@ -65,22 +65,23 @@ class e_menu
 		
 	
 		
-	//	print_a($eMenuArea);
-	if($_SERVER['E_DEV_MENU'] == 'true')
-	{
-		$layouts = e107::getPref('menu_layouts');
-		if(!is_array($layouts))
+		//	print_a($eMenuArea);
+		if($_SERVER['E_DEV_MENU'] == 'true') // New in v2.x
 		{
-			$converted = $this->convertMenuTable();
-			e107::getConfig('core')->set('menu_layouts', $converted)->save();
+			$layouts = e107::getPref('menu_layouts');
+			if(!is_array($layouts))
+			{
+				$converted = $this->convertMenuTable();
+				e107::getConfig('core')->set('menu_layouts', $converted)->save();
+			}
+			
+			$eMenuArea = $this->getData(THEME_LAYOUT);
 		}
-		
-		$eMenuArea = $this->getData(THEME_LAYOUT);
-	}
-	//print_a($eMenuArea);
-		//$eMenuArea = $this->getDataLegacy();
-		
-	//	print_a($eMenuArea);
+		else // the old v1.x way. 
+		{
+			$eMenuArea = $this->getDataLegacy();
+		}
+	
 		
 		$total = array();
 		foreach($eMenuArea as $area => $val)