Merge remote-tracking branch 'joomla/staging' into patch-3

.travis.yml

@@ -29,15 +29,16 @@ before_script:
   # Set up Apache
   # - ./build/travis/php-apache.sh
   # Enable additional PHP extensions
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' == '5.3' ] || [ '$TRAVIS_PHP_VERSION' == '5.4' ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/redis.ini; fi"
-  # PHP 5.5+ needs APCu
-  - if [ '$TRAVIS_PHP_VERSION' == "5.5" ] || [ '$TRAVIS_PHP_VERSION' == "5.6" ]; then printf "\n" | echo -e "extension = apcu.so\napc.enabled=1\napc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi
+  # PHP 5.3 and 5.4 use APC
+  - if [ $TRAVIS_PHP_VERSION == "5.3" ] || [ $TRAVIS_PHP_VERSION == "5.4" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi
+  # PHP 5.5+ use APCu
+  - if [ $TRAVIS_PHP_VERSION == "5.5" ] || [ $TRAVIS_PHP_VERSION == "5.6" ]; then printf "\n" | pecl install apcu-beta; fi
+  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi
 
 script:
   - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi"
+  - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi
 
 branches:
   except:

README.md

@@ -9,20 +9,20 @@ Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://bu
 What is this?
 ---------------------
 * This is a Joomla! 3.x installation/upgrade package.
-* Joomla's [Official website](http://www.joomla.org).
+* Joomla's [Official website](https://www.joomla.org).
 * Joomla! 3.4 [version history](https://docs.joomla.org/Joomla_3.4_version_history).
 * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
 
 What is Joomla?
 ---------------------
 * Joomla is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
-* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](http://www.joomla.org/about-joomla.html).
+* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](https://www.joomla.org/about-joomla.html).
 * Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
 
 Is Joomla! for you?
 ---------------------
 * Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
-* View Joomla's core [features here](http://www.joomla.org/core-features.html).
+* View Joomla's core [features here](https://www.joomla.org/core-features.html).
 * Try it out for yourself in our [online demo](https://demo.joomla.org).
 
 How to find a Joomla! translation?
@@ -32,7 +32,7 @@ How to find a Joomla! translation?
 
 Learn Joomla!
 ---------------------
-* Read ['Getting Started with Joomla!'](https://docs.joomla.org/Getting_Started_with_Joomla!) to learn the basics.
+* Read ['Getting Started with Joomla!'](https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!) to learn the basics.
 * Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Beginners).
 
 What are the benefits of Joomla?
@@ -49,27 +49,27 @@ Is it easy to change the layout display?
 
 Ready to install Joomla?
 ---------------------
-* Check the [minimum requirements](http://www.joomla.org/technical-requirements.html). 
+* Check the [minimum requirements](https://www.joomla.org/technical-requirements.html). 
 * How do you [install Joomla](https://docs.joomla.org/Installing_Joomla!)?
 * You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
 When ready, it can be moved to an on-line hosting account of your choice.
 
 Updates are free!
 ---------------------
-* Always use the [latest version](http://www.joomla.org/download.html).
+* Always use the [latest version](https://www.joomla.org/download.html).
 
 Where can you get support and help?
 ---------------------
 * [The Joomla! Documentation](https://docs.joomla.org/Main_Page);
 * [Frequently Asked Questions](https://docs.joomla.org/Category:FAQ) (FAQ);
 * Find the [information you need](https://docs.joomla.org/Start_here);
-* Find [help and other users](http://www.joomla.org/about-joomla/create-and-share.html);
+* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
 * Post questions at [our forums](http://forum.joomla.org);
 * [Joomla Resources Directory](http://resources.joomla.org/) (JRD).
 
 Do you already have a Joomla site that isn't built with Joomla 3.x?
 ---------------------
-* What's [new in Joomla! 3.x](http://www.joomla.org/3)?
+* What's [new in Joomla! 3.x](https://www.joomla.org/3)?
 * What are the [main differences between 2.5 and 3.x](https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F)?
 * How to [migrate from 2.5.x to 3.x](https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration).
 * How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).

README.txt

@@ -1,26 +1,26 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
-	* Joomla! Official site: http://www.joomla.org
+	* Joomla! Official site: https://www.joomla.org
 	* Joomla! 3.4 version history - https://docs.joomla.org/Joomla_3.4_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.
 	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later
 	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
-	More details here: http://www.joomla.org/about-joomla.html
+	More details here: https://www.joomla.org/about-joomla.html
 
 3- Is Joomla for you?
 	* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
-	* See Features - http://www.joomla.org/core-features.html
+	* See Features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: http://community.joomla.org/translations.html
 	* You can also add languages directly to your website via your Joomla! administration panel.
 
 5- Learn Joomla!
-	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Getting_Started_with_Joomla!
+	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!
 	* Before installing, read the beginners guide: https://docs.joomla.org/Beginners
 
 6- What are the limits of Joomla?
@@ -33,25 +33,25 @@
 	* There are lots of ready made templates that you can download.
 
 8- Ready to install Joomla?
-	* See minimum requirements here: http://www.joomla.org/technical-requirements.html
+	* See minimum requirements here: https://www.joomla.org/technical-requirements.html
 	* How do you install Joomla! ? - https://docs.joomla.org/Installing_Joomla!
 	* Start your Joomla experience building your site with a local test server.
 	When ready it can be moved to an on-line hosting account of your choice.
 	See the tutorial: https://docs.joomla.org/Tutorial:Joomla_Local_install
 
 9- Updates are free!
-	* Always use the latest version: http://www.joomla.org/download.html
+	* Always use the latest version: https://www.joomla.org/download.html
 
 10- Where can you get support and help?
 	* The Joomla! Documentation: https://docs.joomla.org/Main_Page
 	* FAQ Frequently Asked Questions: https://docs.joomla.org/Category:FAQ
 	* Find the information you need: https://docs.joomla.org/Start_here
-	* Find help and other users: http://www.joomla.org/about-joomla/create-and-share.html
+	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
 	* Post questions at our forums: http://forum.joomla.org
 	* Joomla Resources Directory (JRD): http://resources.joomla.org/
 
 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's new in Joomla 3.x: https://www.joomla.org/3
 	* What are the main differences from 2.5 to 3? Table of contents: https://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
 	* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration

administrator/components/com_admin/controllers/profile.php

@@ -63,7 +63,7 @@ public function save($key = null, $urlVar = null)
 	 *
 	 * @param   string  $key  The name of the primary key of the URL variable.
 	 *
-	 * @return  Boolean  True if access level checks pass, false otherwise.
+	 * @return  boolean  True if access level checks pass, false otherwise.
 	 *
 	 * @since   1.6
 	 */

administrator/components/com_admin/models/help.php

@@ -20,7 +20,6 @@ class AdminModelHelp extends JModelLegacy
 	 * The search string
 	 *
 	 * @var    string
-	 *
 	 * @since  1.6
 	 */
 	protected $help_search = null;
@@ -29,16 +28,14 @@ class AdminModelHelp extends JModelLegacy
 	 * The page to be viewed
 	 *
 	 * @var    string
-	 *
 	 * @since  1.6
 	 */
 	protected $page = null;
 
 	/**
-	 * The iso language tag
+	 * The ISO language tag
 	 *
 	 * @var    string
-	 *
 	 * @since  1.6
 	 */
 	protected $lang_tag = null;
@@ -47,7 +44,6 @@ class AdminModelHelp extends JModelLegacy
 	 * Table of contents
 	 *
 	 * @var    array
-	 *
 	 * @since  1.6
 	 */
 	protected $toc = null;
@@ -56,7 +52,6 @@ class AdminModelHelp extends JModelLegacy
 	 * URL for the latest version check
 	 *
 	 * @var    string
-	 *
 	 * @since  1.6
 	 */
 	protected $latest_version_check = null;
@@ -66,7 +61,7 @@ class AdminModelHelp extends JModelLegacy
 	 *
 	 * @return  string  Help search string
 	 *
-	 * @since  1.6
+	 * @since   1.6
 	 */
 	public function &getHelpSearch()
 	{
@@ -83,14 +78,13 @@ public function &getHelpSearch()
 	 *
 	 * @return  string  The page
 	 *
-	 * @since  1.6
+	 * @since   1.6
 	 */
 	public function &getPage()
 	{
 		if (is_null($this->page))
 		{
-			$page = JFactory::getApplication()->input->get('page', 'JHELP_START_HERE');
-			$this->page = JHelp::createUrl($page);
+			$this->page = JHelp::createUrl(JFactory::getApplication()->input->get('page', 'JHELP_START_HERE'));
 		}
 
 		return $this->page;
@@ -107,12 +101,11 @@ public function getLangTag()
 	{
 		if (is_null($this->lang_tag))
 		{
-			$lang = JFactory::getLanguage();
-			$this->lang_tag = $lang->getTag();
+			$this->lang_tag = JFactory::getLanguage()->getTag();
 
 			if (!is_dir(JPATH_BASE . '/help/' . $this->lang_tag))
 			{
-				// Use english as fallback
+				// Use English as fallback
 				$this->lang_tag = 'en-GB';
 			}
 		}
@@ -121,7 +114,7 @@ public function getLangTag()
 	}
 
 	/**
-	 * Method to get the toc
+	 * Method to get the table of contents
 	 *
 	 * @return  array  Table of contents
 	 */
@@ -133,7 +126,7 @@ public function &getToc()
 		}
 
 		// Get vars
-		$lang_tag = $this->getLangTag();
+		$lang_tag    = $this->getLangTag();
 		$help_search = $this->getHelpSearch();
 
 		// New style - Check for a TOC JSON file
@@ -205,7 +198,8 @@ public function &getLatestVersionCheck()
 	{
 		if (!$this->latest_version_check)
 		{
-			$override = 'https://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&lang={langcode}';
+			$override = 'https://help.joomla.org/proxy/index.php?option=com_help&keyref=Help{major}{minor}:'
+				. 'Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&lang={langcode}';
 			$this->latest_version_check = JHelp::createUrl('JVERSION', false, $override);
 		}
 

administrator/components/com_admin/models/profile.php

@@ -103,9 +103,7 @@ protected function loadFormData()
 	 */
 	public function getItem($pk = null)
 	{
-		$user = JFactory::getUser();
-
-		return parent::getItem($user->get('id'));
+		return parent::getItem(JFactory::getUser()->id);
 	}
 
 	/**