Merge remote-tracking branch 'refs/remotes/joomla/staging' into html5…

…-system-admin

.gitignore

@@ -9,6 +9,7 @@
 /administrator/cache
 /administrator/logs
 /cache
+/installation/cache
 /tmp
 /configuration.php
 /.htaccess

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `protected` = 1, `enabled` = 1  WHERE `name` = 'com_ajax';

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE `#__languages` ADD COLUMN `asset_id` INT(11) NOT NULL AFTER `lang_id`;

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql

@@ -1,5 +1,6 @@
-DELETE FROM "#__extensions" WHERE "type" = "library" AND "element" = "simplepie";
-INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+DELETE FROM "#__extensions" WHERE "type" = 'library' AND "element" = 'simplepie';
+
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
 (455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 2, 0),
 (457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 3, 0);

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "protected" = 1, "enabled" = 1 WHERE "name" = 'com_ajax';

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE "#__languages" ADD COLUMN "asset_id" bigint DEFAULT 0 NOT NULL;

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql

@@ -0,0 +1 @@
+UPDATE [#__extensions] SET [protected] = 1, [enabled] = 1 WHERE [name] = 'com_ajax';

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql

@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE [#__languages] ADD [asset_id] [bigint] NOT NULL DEFAULT 0;

administrator/components/com_categories/models/fields/modal/category.php

@@ -195,14 +195,14 @@ protected function getInput()
 			'bootstrap.renderModal',
 			'categorySelect' . $this->id . 'Modal',
 			array(
-				'url'         => $urlSelect,
 				'title'       => JText::_('COM_CATEGORIES_SELECT_A_CATEGORY'),
-				'width'       => '800px',
+				'url'         => $urlSelect,
 				'height'      => '400px',
-				'modalWidth'  => '80',
+				'width'       => '800px',
 				'bodyHeight'  => '70',
+				'modalWidth'  => '80',
 				'footer'      => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
-						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
+						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
 			)
 		);
 
@@ -211,14 +211,15 @@ protected function getInput()
 			'bootstrap.renderModal',
 			'categoryEdit' . $value . 'Modal',
 			array(
-				'url'         => $urlEdit,
 				'title'       => JText::_('COM_CATEGORIES_EDIT_CATEGORY'),
 				'backdrop'    => 'static',
+				'keyboard'    => false,
 				'closeButton' => false,
-				'width'       => '800px',
+				'url'         => $urlEdit,
 				'height'      => '400px',
-				'modalWidth'  => '80',
+				'width'       => '800px',
 				'bodyHeight'  => '70',
+				'modalWidth'  => '80',
 				'footer'      => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
 						. ' onclick="jQuery(\'#categoryEdit' . $value . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
 						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>'
@@ -227,7 +228,7 @@ protected function getInput()
 						. JText::_("JSAVE") . '</button>'
 						. '<button type="button" class="btn btn-success" aria-hidden="true"'
 						. ' onclick="jQuery(\'#categoryEdit' . $value . 'Modal iframe\').contents().find(\'#applyBtn\').click();">'
-						. JText::_("JAPPLY") . '</button>'
+						. JText::_("JAPPLY") . '</button>',
 			)
 		);
 

administrator/components/com_checkin/checkin.xml

@@ -2,6 +2,7 @@
 <extension type="component" version="3.1" method="upgrade">
 	<name>com_checkin</name>
 	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>

administrator/components/com_config/controller/application/store.php

@@ -27,8 +27,9 @@ public function execute()
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin'))
 		{
-			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
-			$this->app->redirect('index.php');
+			echo new JResponseJson(json_encode(false), JText::_('JERROR_ALERTNOAUTHOR'));
+
+			JFactory::getApplication()->close();
 		}
 
 		// Get Post DATA
@@ -40,17 +41,19 @@ public function execute()
 			'title'     => $this->input->get->get('title', '', 'RAW')
 		);
 
-		if (!(substr($permissions['component'], -6) == '.false'))
+		if (!(substr($permissions['component'], -6) === '.false'))
 		{
 			// Load Permissions from Session and send to Model
 			$model    = new ConfigModelApplication;
 			$response = $model->storePermissions($permissions);
 
-			echo new JResponseJson(json_encode($response));
+			echo new JResponseJson(json_encode($response), $response['message']);
 		}
 		else
 		{
 			echo new JResponseJson(json_encode(false), 0);
 		}
+
+		JFactory::getApplication()->close();
 	}
 }