Merge branch 'staging' of https://github.com/joomla/joomla-cms into staging

Author: brianteeman

.travis.yml

@@ -56,7 +56,7 @@ services:
 
 before_script:
   # JavaScript tests
-  - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash tests/javascript/travis-tests.sh $PWD; fi
+  - if [[ $RUN_JAVASCRIPT_TESTS == "yes" ]]; then export DISPLAY=:99.0; bash build/travis/javascript-tests.sh $PWD; fi
   # Make sure all dev dependencies are installed
   - if [[ $RUN_UNIT_TESTS == "yes" ]]; then bash build/travis/unit-tests.sh $PWD; fi
 

README.md

@@ -53,7 +53,7 @@ Ready to install Joomla?
 * Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). 
 * How do you [install Joomla](https://docs.joomla.org/J3.x: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.
+When ready, it can be moved to an online hosting account of your choice.
 
 Updates are free!
 ---------------------

README.txt

@@ -38,7 +38,7 @@
 	* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
 	* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
 	* You could start your Joomla! experience building your site on a local test server.
-	When ready it can be moved to an on-line hosting account of your choice.
+	When ready it can be moved to an online hosting account of your choice.
 	See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
 
 9- Updates are free!

administrator/components/com_banners/banners.php

@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_banners'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JControllerExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 // Execute the task.

administrator/components/com_content/controllers/article.php

@@ -84,45 +84,32 @@ protected function allowEdit($data = array(), $key = 'id')
 	{
 		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
 		$user = JFactory::getUser();
-		$userId = $user->get('id');
 
-		// If we get a deny at the component level, we cannot override here.
-		if (!parent::allowEdit($data, $key))
+		// Zero record (id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
 		{
-			return false;
+			return parent::allowEdit($data, $key);
 		}
 
-		// Check general edit permission first.
+		// Check edit on the record asset (explicit or inherited)
 		if ($user->authorise('core.edit', 'com_content.article.' . $recordId))
 		{
 			return true;
 		}
 
-		// Fallback on edit.own.
-		// First test if the permission is available.
+		// Check edit own on the record asset (explicit or inherited)
 		if ($user->authorise('core.edit.own', 'com_content.article.' . $recordId))
 		{
-			// Now test the owner is the user.
-			$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+			// Existing record already has an owner, get it
+			$record = $this->getModel()->getItem($recordId);
 
-			if (empty($ownerId) && $recordId)
+			if (empty($record))
 			{
-				// Need to do a lookup from the model.
-				$record = $this->getModel()->getItem($recordId);
-
-				if (empty($record))
-				{
-					return false;
-				}
-
-				$ownerId = $record->created_by;
+				return false;
 			}
 
-			// If the owner matches 'me' then permission is granted.
-			if ($ownerId == $userId)
-			{
-				return true;
-			}
+			// Grant if current user is owner of the record
+			return $user->get('id') == $record->created_by;
 		}
 
 		return false;

administrator/components/com_contenthistory/helpers/contenthistory.php

@@ -260,7 +260,7 @@ public static function loadLanguageFiles($typeAlias)
 			$lang->load($component, JPATH_ADMINISTRATOR, null, false, true)
 			|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
 
-			// Force loading of back-end global language file
+			// Force loading of backend global language file
 			$lang->load('joomla', JPath::clean(JPATH_ADMINISTRATOR), null, false, true);
 		}
 	}

administrator/components/com_finder/helpers/language.php

@@ -95,7 +95,7 @@ public static function loadComponentLanguage()
 	}
 
 	/**
-	 * Method to load Smart Search plug-in language files.
+	 * Method to load Smart Search plugin language files.
 	 *
 	 * @return  void
 	 *
@@ -113,7 +113,7 @@ public static function loadPluginLanguage()
 
 		$loaded = true;
 
-		// Get array of all the enabled Smart Search plug-in names.
+		// Get array of all the enabled Smart Search plugin names.
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true)
 			->select('name')
@@ -133,7 +133,7 @@ public static function loadPluginLanguage()
 		$lang = JFactory::getLanguage();
 		$lang->load('plg_content_finder', JPATH_ADMINISTRATOR);
 
-		// Load language file for each plug-in.
+		// Load language file for each plugin.
 		foreach ($plugins as $plugin)
 		{
 			$lang->load($plugin->name, JPATH_ADMINISTRATOR);

administrator/components/com_finder/models/index.php

@@ -240,9 +240,9 @@ protected function getListQuery()
 	}
 
 	/**
-	 * Method to get the state of the Smart Search plug-ins.
+	 * Method to get the state of the Smart Search Plugins.
 	 *
-	 * @return  array  Array of relevant plug-ins and whether they are enabled or not.
+	 * @return  array  Array of relevant plugins and whether they are enabled or not.
 	 *
 	 * @since   2.5
 	 */

administrator/components/com_finder/views/index/view.html.php

@@ -71,7 +71,7 @@ class FinderViewIndex extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		// Load plug-in language files.
+		// Load plugin language files.
 		FinderHelperLanguage::loadPluginLanguage();
 
 		$this->items         = $this->get('Items');

administrator/components/com_finder/views/maps/view.html.php

@@ -64,7 +64,7 @@ class FinderViewMaps extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		// Load plug-in language files.
+		// Load plugin language files.
 		FinderHelperLanguage::loadPluginLanguage();
 
 		// Load the view data.