Merge pull request #2 from joomla/master

Update master

Author: Mathewlenning

.gitignore

@@ -16,3 +16,7 @@
 
 # Test Related Files #
 /phpunit.xml
+/tests/system/webdriver/tests/logs/
+
+# phpDocumentor Logs #
+phpdoc-*

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 5.4
 
 before_script:
+  - composer self-update
   - pyrus channel-discover pear.phpunit.de
   - pyrus install --force phpunit/DbUnit
   - phpenv rehash

README.md

@@ -1,12 +1,17 @@
-Joomla! CMS [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Joomla! CMS
 ====================
 
+Build Status
+---------------------
+Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms)
+Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
+
 What is this?
 ---------------------
-* This is a Joomla! installation/upgrade package to version 3.0.x
+* This is a Joomla! installation/upgrade package to version 3.x
 * Joomla! [Official site](http://www.joomla.org)
-* Joomla! 3.0 [version history](http://docs.joomla.org/Joomla_3.0_version_history)
-* Detailed changes in the [Changelog](http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log)
+* Joomla! 3.1 [version history](http://docs.joomla.org/Joomla_3.1_version_history)
+* Detailed changes in the [Changelog](https://github.com/joomla/joomla-cms/commits/master)
 
 What is Joomla?
 ---------------------
@@ -61,13 +66,13 @@ Where can you get support and help?
 * Post questions at [our forums](http://forum.joomla.org)
 * [Joomla Resources Directory](http://resources.joomla.org/tos.html) (JRD):
 
-Do you already have a Joomla site that's not built with Joomla 3.0.x ?
+Do you already have a Joomla site that's not built with Joomla 3.x ?
 ---------------------
-* What's [new in Joomla 3.0.x](http://www.joomla.org/3)
-* What are the [main differences from 2.5 to 3.0](http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0)?
-* How to [migrate from 2.5.x to 3.0.x](http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0)?
+* What's [new in Joomla 3.x](http://www.joomla.org/3)
+* What are the [main differences from 2.5 to 3.x](http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0)?
+* How to [migrate from 2.5.x to 3.x](http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0)?
 * What are the [main differences from 1.5 to 2.5](http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5)?
-* How to [migrate from 1.5.x to 3.0.x](http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0)?
+* How to [migrate from 1.5.x to 3.x](http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0)?
 * [Convert an existing Web site to Joomla](http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site)
 
 Do you want to improve Joomla?
@@ -81,6 +86,6 @@ Do you want to improve Joomla?
 Copyright:
 ---------------------
 * Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-* [Credits](http://docs.joomla.org/Joomla_3.0_Credits)
+* [Credits](http://docs.joomla.org/Joomla_3_Credits)
 * Distributed under the GNU General Public License version 2 or later
 * See [Licenses details](http://docs.joomla.org/Joomla_Licenses)

README.txt

@@ -1,8 +1,8 @@
 1- What is this?
-	* This is a Joomla! installation/upgrade package to version 3.0.x
+	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: http://www.joomla.org
-	* Joomla 3.0 version history - http://docs.joomla.org/Joomla_3.0_version_history
-	* Detailed changes in the Changelog: http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log
+	* Joomla 3.1 version history - http://docs.joomla.org/Joomla_3.1_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?
 	* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
@@ -49,12 +49,12 @@
 	* Post questions at our forums: http://forum.joomla.org
 	* Joomla Resources Directory (JRD): http://resources.joomla.org/tos.html
 
-11- Do you already have a Joomla site that's not built with Joomla 3.0.x ?
-	* What's new in Joomla 3.0.x - http://www.joomla.org/3
-	* What are the main differences from 2.5 to 3.0? Table of contents: http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
-	* How to migrate from 2.5.x to 3.0.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0
+11- Do you already have a Joomla site that's not built with Joomla 3.x ?
+	* What's new in Joomla 3.x - http://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? Table of contents: http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
+	* How to migrate from 2.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0
 	* What are the main differences from 1.5 to 2.5? Table of contents: http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5
-	* How to migrate from 1.5.x to 3.0.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0
+	* How to migrate from 1.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0
 	* Convert an existing Web site to Joomla - http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
 
 12- Do you want to improve Joomla?
@@ -66,6 +66,6 @@
 
 Copyright:
 	* Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-	* Credits: http://docs.joomla.org/Joomla_3.0_Credits
+	* Credits: http://docs.joomla.org/Joomla_3_Credits
 	* Distributed under the GNU General Public License version 2 or later
 	* See Licenses details at http://docs.joomla.org/Joomla_Licenses

administrator/components/com_admin/admin.php

@@ -8,6 +8,7 @@
  */
 
 defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
 
 // No access check.
 

administrator/components/com_admin/models/forms/profile.xml

@@ -17,24 +17,26 @@
 			size="30"
 		/>
 
-		<field name="password" type="password"
+		<field name="password2" type="password"
 			autocomplete="off"
-			class="inputbox validate-password"
+			class="validate-password"
 			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
+			field="password1"
 			filter="raw"
 			label="JGLOBAL_PASSWORD"
+			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
 			size="30"
 			validate="equals"
-			field="password2"
 		/>
 
-		<field name="password2" type="password"
+		<field name="password1" type="password"
 			autocomplete="off"
-			class="inputbox validate-password"
+			class="validate-password"
 			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
 			filter="raw"
 			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
 			size="30"
+			validate="password"
 		/>
 
 		<field name="email" type="email"

administrator/components/com_admin/models/sysinfo.php

@@ -200,30 +200,26 @@ public function getDirectory()
 
 			// List all admin languages
 			$admin_langs = new DirectoryIterator(JPATH_ADMINISTRATOR . '/language');
-			foreach ($admin_langs as $alang)
+			foreach ($admin_langs as $folder)
 			{
-				if (!$alang->isDir() || $alang->isDot())
+				if (!$folder->isDir() || $folder->isDot())
 				{
 					continue;
 				}
 
-				$name = $alang->getFilename();
-
-				$this->_addDirectory('administrator/language/' . $name, JPATH_ADMINISTRATOR . '/language/' . $name);
+				$this->_addDirectory('administrator/language/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/language/' . $folder->getFilename());
 			}
 
 			// List all manifests folders
 			$manifests = new DirectoryIterator(JPATH_ADMINISTRATOR . '/manifests');
-			foreach ($manifests as $manifest)
+			foreach ($manifests as $folder)
 			{
-				if (!$manifest->isDir() || $manifest->isDot())
+				if (!$folder->isDir() || $folder->isDot())
 				{
 					continue;
 				}
 
-				$name = $manifest->getFilename();
-
-				$this->_addDirectory('administrator/manifests/' . $name, JPATH_ADMINISTRATOR . '/manifests/' . $name);
+				$this->_addDirectory('administrator/manifests/' . $folder->getFilename(), JPATH_ADMINISTRATOR . '/manifests/' . $folder->getFilename());
 			}
 
 			$this->_addDirectory('administrator/modules', JPATH_ADMINISTRATOR . '/modules');
@@ -242,25 +238,21 @@ public function getDirectory()
 					continue;
 				}
 
-				$name = $manifest->getFilename();
-
-				$this->_addDirectory('images/' . $name, JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $name);
+				$this->_addDirectory('images/' . $folder->getFilename(), JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename());
 			}
 
 			$this->_addDirectory('language', JPATH_SITE . '/language');
 
 			// List all site languages
 			$site_langs = new DirectoryIterator(JPATH_SITE . '/language');
-			foreach ($site_langs as $alang)
+			foreach ($site_langs as $folder)
 			{
-				if (!$alang->isDir() || $alang->isDot())
+				if (!$folder->isDir() || $folder->isDot())
 				{
 					continue;
 				}
 
-				$name = $alang->getFilename();
-
-				$this->_addDirectory('language/' . $name, JPATH_SITE . '/language/' . $name);
+				$this->_addDirectory('language/' . $folder->getFilename(), JPATH_SITE . '/language/' . $folder->getFilename());
 			}
 
 			$this->_addDirectory('libraries', JPATH_LIBRARIES);
@@ -269,22 +261,20 @@ public function getDirectory()
 			$this->_addDirectory('modules', JPATH_SITE . '/modules');
 			$this->_addDirectory('plugins', JPATH_PLUGINS);
 
-			$plugin_groups = new DirectoryIterator(JPATH_SITE . '/language');
+			$plugin_groups = new DirectoryIterator(JPATH_SITE . '/plugins');
 			foreach ($plugin_groups as $folder)
 			{
-				if (!$alang->isDir() || $alang->isDot())
+				if (!$folder->isDir() || $folder->isDot())
 				{
 					continue;
 				}
 
-				$name = $alang->getFilename();
-
-				$this->_addDirectory('plugins/' . $name, JPATH_PLUGINS . '/' . $name);
+				$this->_addDirectory('plugins/' . $folder->getFilename(), JPATH_PLUGINS . '/' . $folder->getFilename());
 			}
 
 			$this->_addDirectory('templates', JPATH_SITE . '/templates');
 			$this->_addDirectory('configuration.php', JPATH_CONFIGURATION . '/configuration.php');
-			$this->_addDirectory('cache', JPATH_SITE.'/cache', 'COM_ADMIN_CACHE_DIRECTORY');
+			$this->_addDirectory('cache', JPATH_SITE . '/cache', 'COM_ADMIN_CACHE_DIRECTORY');
 			$this->_addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY');
 
 			$this->_addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');