Merge remote-tracking branch 'remotes/upstream/staging' into modules.…

…events

administrator/components/com_installer/views/warnings/tmpl/default.php

@@ -19,31 +19,28 @@
 	<?php else : ?>
 		<div id="j-main-container">
 	<?php endif;?>
-	<?php
-
-		if (!count($this->messages))
-		{
-			echo '<div class="alert alert-info"><a class="close" data-dismiss="alert" href="#">&times;</a>' . JText::_('COM_INSTALLER_MSG_WARNINGS_NONE') . '</div>';
-		}
-		else
-		{
-			echo JHtml::_('sliders.start', 'warning-sliders', array('useCookie' => 1));
-
-			foreach($this->messages as $message)
-			{
-				echo JHtml::_('sliders.panel', $message['message'], str_replace(' ', '', $message['message']));
-				echo '<div style="padding: 5px;" >' . $message['description'] . '</div>';
-			}
-			echo JHtml::_('sliders.panel', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'), 'furtherinfo-pane');
-			echo '<div style="padding: 5px;" >' . JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC') . '</div>';
-			echo JHtml::_('sliders.end');
-		}
-		?>
-			<div class="clr"> </div>
+		<?php if (!count($this->messages)) : ?>
+			<div class="alert alert-info">
+				<a class="close" data-dismiss="alert" href="#">&times;</a>
+				<?php echo JText::_('COM_INSTALLER_MSG_WARNINGS_NONE'); ?>
+			</div>
+		<?php else : ?>
+			<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning0')); ?>
+				<?php $i = 0; ?>
+				<?php foreach($this->messages as $message) : ?>
+					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', $message['message'], 'warning' . ($i++)); ?>
+						<?php echo $message['description']; ?>
+					<?php echo JHtml::_('bootstrap.endSlide'); ?>
+				<?php endforeach; ?>
+					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'), 'furtherinfo'); ?>
+						<?php echo JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC'); ?>
+					<?php echo JHtml::_('bootstrap.endSlide'); ?>
+			<?php echo JHtml::_('bootstrap.endAccordion'); ?>	
+		<?php endif; ?>
 			<div>
 				<input type="hidden" name="boxchecked" value="0" />
 				<?php echo JHtml::_('form.token'); ?>
 			</div>
 		</div>
 	</form>
-</div>
+</div>

administrator/components/com_users/config.xml

@@ -14,15 +14,15 @@
 
 		<field
 			name="new_usertype"
-			type="usergroup"
+			type="usergrouplist"
 			default="2"
 			label="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL"
 			description="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC">
 		</field>
 
 		<field
 			name="guest_usergroup"
-			type="usergroup"
+			type="usergrouplist"
 			default="1"
 			label="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL"
 			description="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_DESC">
@@ -172,11 +172,11 @@
 			default="0">
 			</field>
 	</fieldset>
-	
+
 	<fieldset
 		name="user_notes_history"
 		label="COM_USERS_CONFIG_FIELD_NOTES_HISTORY" >
-		
+
 			<field
 			name="save_history"
 			type="radio"
@@ -188,7 +188,7 @@
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
-		
+
 		<field
 			name="history_limit"
 			type="text"

administrator/components/com_users/models/forms/mail.xml

@@ -13,14 +13,14 @@
 			label="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL"
 			value="1"
 		/>
-		
+
 		<field name="disabled" type="checkbox"
 			description="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_DESC"
 			label="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_LABEL"
 			value="1"
 		/>
 
-		<field name="group" type="usergroup"
+		<field name="group" type="usergrouplist"
 			default="0"
 			description="COM_USERS_MAIL_FIELD_GROUP_DESC"
 			label="COM_USERS_MAIL_FIELD_GROUP_LABEL"

administrator/components/com_users/models/levels.php

@@ -61,7 +61,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('params', $params);
 
 		// List state information.
-		parent::populateState('a.title', 'asc');
+		parent::populateState('a.ordering', 'asc');
 	}
 
 	/**

administrator/templates/isis/css/template-rtl.css

@@ -6106,6 +6106,11 @@ fieldset.radio.btn-group {
 input.invalid {
 	border: 1px solid #9d261d;
 }
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
 .tooltip {
 	max-width: 400px;
 }

administrator/templates/isis/css/template.css

@@ -6106,6 +6106,11 @@ fieldset.radio.btn-group {
 input.invalid {
 	border: 1px solid #9d261d;
 }
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
 .tooltip {
 	max-width: 400px;
 }

build/build.php

@@ -157,28 +157,28 @@
 	foreach ($files as $file)
 	{
 		$fileName   = substr($file, 2);
-		$folderPath = explode('/', $file);
-		$folderName = $folderPath[0];
+		$folderPath = explode('/', $fileName);
+		$baseFolderName = $folderPath[0];
 
-		// TODO - Old check, commented for reference, remove when complete
-		/*if (substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($file, 2, 5) != 'build' && substr($file, 2, 4) != '.git'
-			&& substr($file, 2, 7) != '.travis' && substr($file, 2, 6) != 'travis' && substr($file, 2, 7) != 'phpunit' && substr($file, -3) != '.md'
-			&& substr($file, 2, 6) != 'images')
-		{*/
+		$doNotPackageFile = in_array(trim($fileName), $doNotPackage);
+		$doNotPatchFile = in_array(trim($fileName), $doNotPatch);
+		$doNotPackageBaseFolder = in_array($baseFolderName, $doNotPackage);
+		$doNotPatchBaseFolder = in_array($baseFolderName, $doNotPatch);
 
-		if (!in_array($fileName, $doNotPackage) && !in_array($fileName, $doNotPatch)
-			&& !in_array($folderName, $doNotPackage) && !in_array($folderName, $doNotPatch))
+		if ($doNotPackageFile || $doNotPatchFile || $doNotPackageBaseFolder || $doNotPatchBaseFolder)
 		{
-			// Don't add deleted files to the list
-			if (substr($file, 0, 1) != 'D')
-			{
-				$filesArray[$fileName] = true;
-			}
-			else
-			{
-				// Add deleted files to the deleted files list
-				$deletedFiles[] = $fileName;
-			}
+			continue;
+		}
+
+		// Don't add deleted files to the list
+		if (substr($file, 0, 1) != 'D')
+		{
+			$filesArray[$fileName] = true;
+		}
+		else
+		{
+			// Add deleted files to the deleted files list
+			$deletedFiles[] = $fileName;
 		}
 	}
 

components/com_content/helpers/icon.php

@@ -157,12 +157,24 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 			&& $article->checked_out != $user->get('id'))
 		{
 			$checkoutUser = JFactory::getUser($article->checked_out);
-			$button       = JHtml::_('image', 'system/checked_out.png', null, null, true);
 			$date         = JHtml::_('date', $article->checked_out_time);
 			$tooltip      = JText::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . JText::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name)
 				. ' <br /> ' . $date;
 
-			return '<span class="hasTooltip" title="' . JHtml::tooltipText($tooltip . '', 0) . '">' . $button . '</span>';
+			if ($legacy)
+			{
+				$button = JHtml::_('image', 'system/checked_out.png', null, null, true);
+				$text   = '<span class="hasTooltip" title="' . JHtml::tooltipText($tooltip . '', 0) . '">'
+					. $button . '</span> ' . JText::_('JLIB_HTML_CHECKED_OUT');
+			}
+			else
+			{
+				$text = '<span class="hasTooltip icon-lock" title="' . JHtml::tooltipText($tooltip . '', 0) . '"></span> ' . JText::_('JLIB_HTML_CHECKED_OUT');
+			}
+
+			$output = JHtml::_('link', '#', $text, $attribs);
+
+			return $output;
 		}
 
 		$url = 'index.php?option=com_content&task=article.edit&a_id=' . $article->id . '&return=' . base64_encode($uri);

components/com_tags/helpers/route.php

@@ -143,9 +143,15 @@ protected static function _findItem($needles = null)
 						}
 
 						// Only match menu items that list one tag
-						if (isset($item->query['id'][0]) && count($item->query['id']) == 1)
+						if (isset($item->query['id']) && is_array($item->query['id']))
 						{
-							self::$lookup[$lang][$view][$item->query['id'][0]] = $item->id;
+							foreach ($item->query['id'] as $position => $tagId)
+							{
+								if (!isset(self::$lookup[$lang][$view][$item->query['id'][$position]]) || count($item->query['id']) == 1)
+								{
+									self::$lookup[$lang][$view][$item->query['id'][$position]] = $item->id;
+								}
+							}
 						}
 					}
 				}

components/com_tags/models/tag.php

@@ -167,10 +167,11 @@ protected function getListQuery()
 	 */
 	protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 	{
-		$app = JFactory::getApplication('site');
+		$app = JFactory::getApplication();
 
 		// Load the parameters.
-		$params = JComponentHelper::getParams('com_tags');
+		$params = $app->isAdmin() ? JComponentHelper::getParams('com_tags') : $app->getParams();
+
 		$this->setState('params', $params);
 
 		// Load state from the request.

components/com_tags/router.php

@@ -51,6 +51,7 @@ public function build(&$query)
 		}
 
 		$view = '';
+
 		if (isset($query['view']))
 		{
 			$view = $query['view'];
@@ -67,12 +68,15 @@ public function build(&$query)
 		if ($mView == $view && isset($query['id']) && $mId == $query['id'])
 		{
 			unset($query['id']);
+
 			return $segments;
 		}
 
-		if (isset($view) and $view == 'tag')
+		if ($view == 'tag')
 		{
-			if (($mId != (int) $query['id'] || $mView != $view) && $view == 'tag')
+			$notActiveTag = is_array($mId) ? (count($mId) > 1 || $mId[0] != (int) $query['id']) : ($mId != (int) $query['id']);
+
+			if ($notActiveTag || $mView != $view)
 			{
 				// ID in com_tags can be either an integer, a string or an array of IDs
 				$id = is_array($query['id']) ? implode(',', $query['id']) : $query['id'];
@@ -155,7 +159,7 @@ public function parse(&$segments)
  *
  * @deprecated  4.0  Use Class based routers instead
  */
-function TagsBuildRoute(&$query)
+function tagsBuildRoute(&$query)
 {
 	$router = new TagsRouter;
 
@@ -171,7 +175,7 @@ function TagsBuildRoute(&$query)
  *
  * @deprecated  4.0  Use Class based routers instead
  */
-function TagsParseRoute($segments)
+function tagsParseRoute($segments)
 {
 	$router = new TagsRouter;
 

components/com_tags/views/tags/tmpl/default.php

@@ -16,7 +16,7 @@
 $descriptionImage = $this->params->get('all_tags_description_image');
 ?>
 <div class="tag-category<?php echo $this->pageclass_sfx; ?>">
-	<?php if ($this->state->get('show_page_heading')) : ?>
+	<?php if ($this->params->get('show_page_heading')) : ?>
 		<h1>
 			<?php echo $this->escape($this->params->get('page_heading')); ?>
 		</h1>
@@ -30,4 +30,4 @@
 
 	<?php echo $this->loadTemplate('items'); ?>
 
-</div>
+</div>

installation/language/nl-NL/nl-NL.ini

@@ -1,4 +1,4 @@
-; nl-NL.ini 3.0
+; nl-NL.ini 3.4
 ; Joomla! Project
 ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
@@ -180,6 +180,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Nederlands"
 
 ;Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Er kan geen verbinding worden gemaakt met de database. Foutnummer: %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="De installatie kan niet met de gespecificeerde database verbinden en kan geen database aanmaken. Controleer uw instellingen en maak, indien nodig, handmatig de database aan."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kan de manifest cache niet verversen van extensie: %s"
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Er deden zich enkele fouten voor tijdens de back-up van de database."
@@ -191,6 +192,8 @@ INSTL_DATABASE_FIX_TOO_LONG="Het MySQL tabelvoorvoegsel mag maximaal 15 tekens b
 INSTL_DATABASE_INVALID_DB_DETAILS="De ingevoerde databasegegevens zijn onjuist en/of leeg."
 INSTL_DATABASE_INVALID_MYSQL_VERSION="MySQL 5.0.4 of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="MySQL 5.0.4 of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
+INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="MySQL 5.0.4 of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="PostgreSQL 8.3.18 of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
 INSTL_DATABASE_INVALID_SQLSRV_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
 INSTL_DATABASE_INVALID_TYPE="Selecteer een databasetype"

installation/sql/mysql/joomla.sql

@@ -1968,7 +1968,7 @@ CREATE TABLE IF NOT EXISTS `#__viewlevels` (
 
 INSERT INTO `#__viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
 (1, 'Public', 0, '[1]'),
-(2, 'Registered', 1, '[6,2,8]'),
-(3, 'Special', 2, '[6,3,8]'),
-(5, 'Guest', 0, '[9]'),
-(6, 'Super Users', 0, '[8]');
+(2, 'Registered', 2, '[6,2,8]'),
+(3, 'Special', 3, '[6,3,8]'),
+(5, 'Guest', 1, '[9]'),
+(6, 'Super Users', 4, '[8]');

installation/sql/mysql/sample_data.sql

@@ -11,6 +11,7 @@ TRUNCATE `#__menu`;
 TRUNCATE `#__menu_types`;
 TRUNCATE `#__modules`;
 TRUNCATE `#__modules_menu`;
+TRUNCATE `#__tags`;
 
 INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
 (1, 0, 0, 119, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.login.offline":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),

installation/sql/mysql/sample_learn.sql

@@ -762,11 +762,11 @@ INSERT IGNORE INTO `#__usergroups` (`id`, `parent_id`, `lft`, `rgt`, `title`) VA
 
 INSERT IGNORE INTO `#__viewlevels` (`id`, `title`, `ordering`, `rules`) VALUES
 (1, 'Public', 0, '[1]'),
-(2, 'Registered', 1, '[6,2,8]'),
-(3, 'Special', 2, '[6,3,8]'),
+(2, 'Registered', 2, '[6,2,8]'),
+(3, 'Special', 4, '[6,3,8]'),
 (4, 'Customer Access Level (Example)', 3, '[6,3,12]'),
-(5, 'Guest', 0, '[13]'),
-(6, 'Super Users', 0, '[8]');
+(5, 'Guest', 1, '[13]'),
+(6, 'Super Users', 5, '[8]');
 
 UPDATE `#__extensions` SET `params`='{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"13","sendpassword":"1","useractivation":"1","mail_to_admin":"0","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","mailSubjectPrefix":"","mailBodySuffix":"","save_history":"1","history_limit":5}' WHERE extension_id=25;
 

installation/sql/mysql/sample_testing.sql

@@ -12,6 +12,7 @@ TRUNCATE `#__menu_types`;
 TRUNCATE `#__modules`;
 TRUNCATE `#__modules_menu`;
 TRUNCATE `#__usergroups`;
+TRUNCATE `#__tags`;
 
 INSERT IGNORE INTO `#__assets` (`id`, `parent_id`, `lft`, `rgt`, `level`, `name`, `title`, `rules`) VALUES
 (1, 0, 1, 437, 0, 'root.1', 'Root Asset', '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'),

installation/sql/postgresql/joomla.sql

@@ -1893,10 +1893,10 @@ COMMENT ON COLUMN "#__viewlevels"."rules" IS 'JSON encoded access control.';
 --
 INSERT INTO "#__viewlevels" ("id", "title", "ordering", "rules") VALUES
 (1, 'Public', 0, '[1]'),
-(2, 'Registered', 1, '[6,2,8]'),
-(3, 'Special', 2, '[6,3,8]'),
-(5, 'Guest', 0, '[9]'),
-(6, 'Super Users', 0, '[8]');
+(2, 'Registered', 2, '[6,2,8]'),
+(3, 'Special', 3, '[6,3,8]'),
+(5, 'Guest', 1, '[9]'),
+(6, 'Super Users', 4, '[8]');
 
 SELECT setval('#__viewlevels_id_seq', 7, false);