--- mambo/branches/4.6/administrator/components/com_menus/admin.menus.php	2007/01/23 23:14:18	905
+++ mambo/branches/4.6/administrator/components/com_menus/admin.menus.php	2009/02/17 11:25:53	1754
@@ -1,14 +1,15 @@
 <?php
 /**
-* @package Mambo Open Source
+* @package Mambo
 * @subpackage Menus
-* @copyright (C) 2005 - 2006 Mambo Foundation Inc.
-* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
-*
-* Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
-* that Mambo remained free Open Source software owned and managed by the community.
-* Mambo is Free Software
-*/ 
+* @author Mambo Foundation Inc see README.php
+* @copyright Mambo Foundation Inc.
+* See COPYRIGHT.php for copyright notices and details.
+* @license GNU/GPL Version 2, see LICENSE.php
+* Mambo is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; version 2 of the License.
+*/
 
 /** ensure this file is being included by a parent file */
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -380,7 +381,7 @@
 	$row->checkin();
 	$row->updateOrder( "menutype='$row->menutype' AND parent='$row->parent'" );
 
-	$msg = 'Menu item Saved';
+	$msg = T_('Menu item Saved');
 	switch ( $task ) {
 		case 'apply':
 			mosRedirect( 'index2.php?option='. $option .'&menutype='. $row->menutype .'&task=edit&id='. $row->id . '&hidemainmenu=1' , $msg );
@@ -438,6 +439,7 @@
 	$state = "-2";
 	//seperate contentids
 	$cids = implode( ',', $cid );
+	// @RawSQLUse, trivial_implementation, UPDATE
 	$query = 	"UPDATE #__menu SET published = '". $state ."', ordering = '0'"
 	. "\n WHERE id IN ( ". $cids ." )"
 	;
@@ -527,11 +529,13 @@
 
 	## query to list selected menu items
 	$cids = implode( ',', $cid );
+	// @RawSQLUse, trivial_implementation, SELECT
 	$query = "SELECT a.name FROM #__menu AS a WHERE a.id IN ( ". $cids ." )";
 	$database->setQuery( $query );
 	$items = $database->loadObjectList();
 
 	## query to choose menu
+	// @RawSQLUse, trivial_implementation, SELECT
 	$query = "SELECT a.params FROM #__modules AS a WHERE a.module = 'mod_mainmenu' ORDER BY a.title";
 	$database->setQuery( $query );
 	$modules = $database->loadObjectList();
@@ -556,6 +560,7 @@
 {
 	global $database;
 
+	// @RawSQLUse, trivial_implementation, SELECT, CONCEPT
     $database->setQuery("SELECT id FROM #__menu WHERE parent=$id");
     $rows = $database->loadObjectList();
     if ($database->getErrorNum()) {
@@ -632,6 +637,7 @@
 
 	## query to list selected menu items
 	$cids = implode( ',', $cid );
+	// @RawSQLUse, trivial_implementation, SELECT, CONCEPT
 	$query = "SELECT a.name FROM #__menu AS a WHERE a.id IN ( ". $cids ." )";
 	$database->setQuery( $query );
 	$items = $database->loadObjectList();
@@ -665,6 +671,8 @@
 		$cidref[] = array($id, $curr->id);
 	}
 	foreach ( $cidref as $ref ) {
+		unset($curr);
+		$curr = new mosMenu( $database );
 		$curr->load( $ref[1] );
 		if ($curr->parent!=0) {
 			$found = false;
@@ -700,7 +708,7 @@
 	$group = $parser->getGroup('menu');
 
 	if ( ( $component <> -1 ) && ( $name == 'Component') ) {
-			$name .= ' - '. $component;
+			$name = T_($name) . ' - '. $component;
 	}
 
 	$row[0]	= $name;