Merging with master

chdemko · Nov 14, 2011 · f0552c3 · f0552c3
2 parents ed4df77 + 9218fd8
commit f0552c3
Show file tree

Hide file tree

Showing 139 changed files with 4,520 additions and 175 deletions.
diff --git a/libraries/index.html b/libraries/index.html
diff --git a/libraries/joomla/access/index.html b/libraries/joomla/access/index.html
diff --git a/libraries/joomla/application/cli.php b/libraries/joomla/application/cli.php
@@ -365,7 +365,7 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
 			}
 			else
 			{
-				throw new Exception('Configuration class does not exist.');
+				throw new RuntimeException('Configuration class does not exist.');
 			}
 		}
 

diff --git a/libraries/joomla/application/component/controller.php b/libraries/joomla/application/component/controller.php
@@ -287,7 +287,7 @@ public static function getInstance($prefix, $config = array())
 			}
 			else
 			{
-				throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
+				throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
 			}
 		}
 
@@ -298,7 +298,7 @@ public static function getInstance($prefix, $config = array())
 		}
 		else
 		{
-			throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class));
+			throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class));
 		}
 
 		return self::$instance;

diff --git a/libraries/joomla/application/component/index.html b/libraries/joomla/application/component/index.html
diff --git a/libraries/joomla/application/index.html b/libraries/joomla/application/index.html
diff --git a/libraries/joomla/application/input/index.html b/libraries/joomla/application/input/index.html
diff --git a/libraries/joomla/application/module/index.html b/libraries/joomla/application/module/index.html
diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
@@ -324,13 +324,13 @@ public function execute()
 			$this->compress();
 		}
 
-		// Trigger the onBeforeRender event.
+		// Trigger the onBeforeRespond event.
 		$this->triggerEvent('onBeforeRespond');
 
 		// Send the application response.
 		$this->respond();
 
-		// Trigger the onBeforeRender event.
+		// Trigger the onAfterRespond event.
 		$this->triggerEvent('onAfterRespond');
 	}
 
@@ -367,14 +367,14 @@ protected function render()
 			'params' => ''
 		);
 
-		// Handle the convention-based default case for themes path.
-		if (defined('JPATH_BASE'))
+		if ($this->get('themes.base'))
 		{
-			$options['directory'] = JPATH_BASE . '/themes';
+			$options['directory'] = $this->get('themes.base');
 		}
+		// Fall back to constants.
 		else
 		{
-			$options['directory'] = dirname(__FILE__) . '/themes';
+			$options['directory'] = (defined('JPATH_BASE') ? JPATH_BASE : dirname(__FILE__)) . '/themes';
 		}
 
 		// Parse the document.
@@ -1042,7 +1042,7 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
 			}
 			else
 			{
-				throw new Exception('Configuration class does not exist.');
+				throw new RuntimeException('Configuration class does not exist.');
 			}
 		}
 

diff --git a/libraries/joomla/base/index.html b/libraries/joomla/base/index.html
diff --git a/libraries/joomla/base/object.php b/libraries/joomla/base/object.php
@@ -239,9 +239,11 @@ public function setError($error)
 	 */
 	function toString()
 	{
+		// @codeCoverageIgnoreStart
 		// Deprecation warning.
 		JLog::add('JObject::toString() is deprecated.', JLog::WARNING, 'deprecated');
 
 		return $this->__toString();
+		// @codeCoverageIgnoreEnd
 	}
 }
diff --git a/libraries/joomla/base/observable.php b/libraries/joomla/base/observable.php
@@ -16,6 +16,7 @@
  * @subpackage  Base
  * @since       11.1
  * @deprecated  12.3
+ * @codeCoverageIgnore
  */
 class JObservable extends JObject
 {

diff --git a/libraries/joomla/base/observer.php b/libraries/joomla/base/observer.php
@@ -16,6 +16,7 @@
  * @subpackage  Base
  * @since       11.1
  * @deprecated  12.3
+ * @codeCoverageIgnore
  */
 abstract class JObserver extends JObject
 {

diff --git a/libraries/joomla/cache/controller/index.html b/libraries/joomla/cache/controller/index.html
diff --git a/libraries/joomla/cache/index.html b/libraries/joomla/cache/index.html
diff --git a/libraries/joomla/cache/storage/helpers/index.html b/libraries/joomla/cache/storage/helpers/index.html
diff --git a/libraries/joomla/cache/storage/index.html b/libraries/joomla/cache/storage/index.html
diff --git a/libraries/joomla/client/index.html b/libraries/joomla/client/index.html
diff --git a/libraries/joomla/database/database/index.html b/libraries/joomla/database/database/index.html
diff --git a/libraries/joomla/database/index.html b/libraries/joomla/database/index.html
diff --git a/libraries/joomla/database/table/index.html b/libraries/joomla/database/table/index.html
diff --git a/libraries/joomla/document/error/index.html b/libraries/joomla/document/error/index.html
diff --git a/libraries/joomla/document/feed/index.html b/libraries/joomla/document/feed/index.html
diff --git a/libraries/joomla/document/feed/renderer/index.html b/libraries/joomla/document/feed/renderer/index.html
diff --git a/libraries/joomla/document/html/index.html b/libraries/joomla/document/html/index.html
diff --git a/libraries/joomla/document/html/renderer/index.html b/libraries/joomla/document/html/renderer/index.html
diff --git a/libraries/joomla/document/index.html b/libraries/joomla/document/index.html
diff --git a/libraries/joomla/document/json/index.html b/libraries/joomla/document/json/index.html
diff --git a/libraries/joomla/document/opensearch/index.html b/libraries/joomla/document/opensearch/index.html
diff --git a/libraries/joomla/document/raw/index.html b/libraries/joomla/document/raw/index.html
diff --git a/libraries/joomla/document/xml/index.html b/libraries/joomla/document/xml/index.html
diff --git a/libraries/joomla/environment/index.html b/libraries/joomla/environment/index.html
diff --git a/libraries/joomla/error/index.html b/libraries/joomla/error/index.html
diff --git a/libraries/joomla/event/index.html b/libraries/joomla/event/index.html
diff --git a/libraries/joomla/filesystem/archive/index.html b/libraries/joomla/filesystem/archive/index.html
diff --git a/libraries/joomla/filesystem/index.html b/libraries/joomla/filesystem/index.html
diff --git a/libraries/joomla/filesystem/streams/index.html b/libraries/joomla/filesystem/streams/index.html
diff --git a/libraries/joomla/filesystem/support/index.html b/libraries/joomla/filesystem/support/index.html
diff --git a/libraries/joomla/filter/index.html b/libraries/joomla/filter/index.html
diff --git a/libraries/joomla/form/fields/index.html b/libraries/joomla/form/fields/index.html
diff --git a/libraries/joomla/form/index.html b/libraries/joomla/form/index.html
diff --git a/libraries/joomla/form/rules/index.html b/libraries/joomla/form/rules/index.html
diff --git a/libraries/joomla/html/html/index.html b/libraries/joomla/html/html/index.html
diff --git a/libraries/joomla/html/index.html b/libraries/joomla/html/index.html
diff --git a/libraries/joomla/html/parameter/element/index.html b/libraries/joomla/html/parameter/element/index.html
diff --git a/libraries/joomla/html/parameter/index.html b/libraries/joomla/html/parameter/index.html
diff --git a/libraries/joomla/html/toolbar/button/index.html b/libraries/joomla/html/toolbar/button/index.html
diff --git a/libraries/joomla/html/toolbar/index.html b/libraries/joomla/html/toolbar/index.html
diff --git a/libraries/joomla/index.html b/libraries/joomla/index.html
diff --git a/libraries/joomla/installer/adapters/index.html b/libraries/joomla/installer/adapters/index.html
diff --git a/libraries/joomla/installer/index.html b/libraries/joomla/installer/index.html
diff --git a/libraries/joomla/language/index.html b/libraries/joomla/language/index.html
diff --git a/libraries/joomla/mail/index.html b/libraries/joomla/mail/index.html
diff --git a/libraries/joomla/media/filters/index.html b/libraries/joomla/media/filters/index.html
diff --git a/libraries/joomla/media/index.html b/libraries/joomla/media/index.html
diff --git a/libraries/joomla/plugin/index.html b/libraries/joomla/plugin/index.html
diff --git a/libraries/joomla/registry/format/index.html b/libraries/joomla/registry/format/index.html
diff --git a/libraries/joomla/registry/index.html b/libraries/joomla/registry/index.html
diff --git a/libraries/joomla/session/index.html b/libraries/joomla/session/index.html
diff --git a/libraries/joomla/session/storage/index.html b/libraries/joomla/session/storage/index.html
diff --git a/libraries/joomla/updater/adapters/collection.php b/libraries/joomla/updater/adapters/collection.php
@@ -121,13 +121,13 @@ public function _startElement($parser, $name, $attrs = array())
 					if (!array_key_exists($col, $attrs))
 					{
 						$attrs[$col] = '';
-						if ($col == 'CLIENT_ID')
+						if ($col == 'CLIENT')
 						{
 							$attrs[$col] = 'site';
 						}
 					}
 				}
-				$client = JApplicationHelper::getClientInfo($attrs['CLIENT_ID'], 1);
+				$client = JApplicationHelper::getClientInfo($attrs['CLIENT'], 1);
 				$attrs['CLIENT_ID'] = $client->id;
 				// Lower case all of the fields
 				foreach ($attrs as $key => $attr)

diff --git a/libraries/joomla/updater/adapters/index.html b/libraries/joomla/updater/adapters/index.html
diff --git a/libraries/joomla/updater/index.html b/libraries/joomla/updater/index.html
diff --git a/libraries/joomla/user/helper.php b/libraries/joomla/user/helper.php
@@ -531,14 +531,6 @@ public static function genRandomPassword($length = 8)
 		$len = strlen($salt);
 		$makepass = '';
 
-		$stat = @stat(__FILE__);
-		if (empty($stat) || !is_array($stat))
-		{
-			$stat = array(php_uname());
-		}
-
-		mt_srand(crc32(microtime() . implode('|', $stat)));
-
 		for ($i = 0; $i < $length; $i++)
 		{
 			$makepass .= $salt[mt_rand(0, $len - 1)];

diff --git a/libraries/joomla/user/index.html b/libraries/joomla/user/index.html
diff --git a/libraries/joomla/utilities/garbagecron.txt b/libraries/joomla/utilities/garbagecron.txt
diff --git a/libraries/joomla/utilities/index.html b/libraries/joomla/utilities/index.html
diff --git a/libraries/phpmailer/index.html b/libraries/phpmailer/index.html
diff --git a/libraries/phpmailer/language/index.html b/libraries/phpmailer/language/index.html
diff --git a/libraries/phputf8/index.html b/libraries/phputf8/index.html
diff --git a/libraries/phputf8/mbstring/index.html b/libraries/phputf8/mbstring/index.html
diff --git a/libraries/phputf8/native/index.html b/libraries/phputf8/native/index.html
diff --git a/libraries/phputf8/utils/index.html b/libraries/phputf8/utils/index.html
diff --git a/libraries/simplepie/idn/index.html b/libraries/simplepie/idn/index.html
diff --git a/libraries/simplepie/index.html b/libraries/simplepie/index.html
diff --git a/media/system/js/mootree-uncompressed.js b/media/system/js/mootree-uncompressed.js
@@ -629,7 +629,7 @@ var MooTreeNode = new Class({
 				url: url,
 				onSuccess: this._loaded.bind(this),
 				onFailure: this._load_err.bind(this)
-			}).send(url, vars || '');
+			}).send(vars || '');
 		}.bind(this).delay(20);
 
 		//window.setTimeout(f.bind(this), 20); // allowing a small delay for the browser to draw the loader-icon.