Merge pull request joomla#136 from WebMechanic/client_id

Undefined index: 'CLIENT' in updater/adapters/collection.php

libraries/joomla/updater/adapters/collection.php

@@ -18,13 +18,13 @@
  * @subpackage  Updater
  * @since       11.1
  * */
- 
+
 class JUpdaterCollection extends JUpdateAdapter {
 	/**
 	 * Root of the tree
-	 * 
+	 *
 	 * @var    object
-	 * @since  11.1 
+	 * @since  11.1
 	 */
 	protected $base;
 
@@ -38,9 +38,9 @@ class JUpdaterCollection extends JUpdateAdapter {
 
 	/**
 	 * Used to control if an item has a child or not
-	 * 
+	 *
 	 * @var    boolean
-	 * @since  11.1 
+	 * @since  11.1
 	 */
 	protected $pop_parent = 0;
 
@@ -52,7 +52,7 @@ class JUpdaterCollection extends JUpdateAdapter {
 	/**
 	 * A list of discovered updates
 	 *
-	 * @var array 
+	 * @var array
 	 */
 	protected $updates;
 
@@ -71,7 +71,7 @@ protected function _getStackLocation()
 
 	/**
 	 * Get the parent tag
-	 * 
+	 *
 	 * @return  string   parent
 	 *
 	 * @since   11.1
@@ -117,13 +117,13 @@ public function _startElement($parser, $name, $attrs = Array())
 					if(!array_key_exists($col, $attrs))
 					{
 						$attrs[$col] = '';
-						if($col == 'CLIENT')
+						if($col == 'CLIENT_ID')
 						{
 							$attrs[$col] = 'site';
 						}
 					}
 				}
-				$client = JApplicationHelper::getClientInfo($attrs['CLIENT'],1);
+				$client = JApplicationHelper::getClientInfo($attrs['CLIENT_ID'],1);
 				$attrs['CLIENT_ID'] = $client->id;
 				// Lower case all of the fields
 				foreach($attrs as $key=>$attr)
@@ -158,7 +158,7 @@ public function _startElement($parser, $name, $attrs = Array())
 	 *
 	 * @param   object  $parser  Parser object
 	 * @param   string  $name    Name of the element closing
-	 * 
+	 *
 	 * @since   11.1
 	 */
 	protected function _endElement($parser, $name)
@@ -181,11 +181,11 @@ protected function _endElement($parser, $name)
 
 	/*
 	 * Find an update
-	 * 
+	 *
 	 * @param   array    Options to use: update_site_id: the unique ID of the update site to look at
 	 *
 	 * @return  array    Update_sites and updates discovered
-	 * 
+	 *
 	 * @since   11.1
 	 */
 	public function findUpdate($options)