Merge remote-tracking branch 'remotes/upstream/staging' into username

Conflicts:
	administrator/language/en-GB/en-GB.com_users.ini

.drone.yml

@@ -1,5 +1,5 @@
 build:
-  image: yveshoppe/joomla-systemtests:latest
+  image: joomlaprojects/docker-systemtests:latest
   commands:
     - apt-get install nodejs npm
     - ln -s /usr/bin/nodejs /usr/bin/node

README.md

@@ -15,13 +15,13 @@ What is this?
 
 What is Joomla?
 ---------------------
-* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* [Joomla!](https://www.joomla.org/about-joomla.html) 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 [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
-* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
+* 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/Portal:Learn_More).
+* Joomla! is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
 * 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).
 
@@ -38,9 +38,9 @@ Learn Joomla!
 
 What are the benefits of Joomla?
 ---------------------
-* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
 * There are many ready-made extensions that you can download and install.
-* Check out the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org).
+* Check out the [Joomla! Extensions Directory (JED)](https://extensions.joomla.org).
 
 Is it easy to change the layout display?
 ---------------------

README.txt

@@ -5,13 +5,13 @@
 	* 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.
+	* 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.
 	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
 
 3- Is Joomla! for you?
-	* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
 	* See Joomla's core features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
@@ -25,9 +25,9 @@
 	* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
 
 6- What are the benefits of Joomla?
-	* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
 	* There are many ready-made extensions that you can download and install.
-	* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+	* Check out the Joomla! Extensions Directory (JED): https://extensions.joomla.org
 
 7- Is it easy to change the layout display?
 	* The layout is controlled by templates that you can edit.

administrator/components/com_contenthistory/models/compare.php

@@ -74,7 +74,28 @@ public function getItems()
 					$object = new stdClass;
 					$object->data = ContenthistoryHelper::prepareData($table);
 					$object->version_note = $table->version_note;
-					$object->save_date = $table->save_date;
+
+					// Let's use custom calendars when present
+					$object->save_date = JHtml::_('date', $table->save_date, 'Y-m-d H:i:s');
+
+					$dateProperties = array (
+						'modified_time',
+						'created_time',
+						'modified',
+						'created',
+						'checked_out_time',
+						'publish_up',
+						'publish_down',
+					);
+
+					foreach ($dateProperties as $dateProperty)
+					{
+						if (array_key_exists($dateProperty, $object->data) && $object->data->$dateProperty->value != '0000-00-00 00:00:00')
+						{
+							$object->data->$dateProperty->value = JHtml::_('date', $object->data->$dateProperty->value, 'Y-m-d H:i:s');
+						}
+					}
+
 					$result[] = $object;
 				}
 

administrator/components/com_contenthistory/models/preview.php

@@ -64,10 +64,30 @@ public function getItem()
 		if ($return == true)
 		{
 			$result = new stdClass;
-			$result->save_date = $table->save_date;
 			$result->version_note = $table->version_note;
 			$result->data = ContenthistoryHelper::prepareData($table);
 
+			// Let's use custom calendars when present
+			$result->save_date = JHtml::_('date', $table->save_date, 'Y-m-d H:i:s');
+
+			$dateProperties = array (
+				'modified_time',
+				'created_time',
+				'modified',
+				'created',
+				'checked_out_time',
+				'publish_up',
+				'publish_down',
+			);
+
+			foreach ($dateProperties as $dateProperty)
+			{
+				if (array_key_exists($dateProperty, $result->data) && $result->data->$dateProperty->value != '0000-00-00 00:00:00')
+				{
+					$result->data->$dateProperty->value = JHtml::_('date', $result->data->$dateProperty->value, 'Y-m-d H:i:s');
+				}
+			}
+
 			return $result;
 		}
 	}

administrator/components/com_menus/views/items/view.html.php

@@ -311,6 +311,12 @@ protected function addToolbar()
 			JToolbarHelper::trash('items.trash');
 		}
 
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::preferences('com_menus');
+		}
+
 		JToolbarHelper::help('JHELP_MENUS_MENU_ITEM_MANAGER');
 	}
 

administrator/components/com_redirect/models/link.php

@@ -199,7 +199,7 @@ public function activate(&$pks, $url, $comment = null)
 	}
 
 	/**
-	 * Method to duplicate URL links.
+	 * Method to batch update URLs to have new redirect urls and comments. Note will publish any unpublished URLs.
 	 *
 	 * @param   array   &$pks     An array of link ids.
 	 * @param   string  $url      The new URL to set for the redirect.
@@ -236,6 +236,7 @@ public function duplicateUrls(&$pks, $url, $comment = null)
 				->update($db->quoteName('#__redirect_links'))
 				->set($db->quoteName('new_url') . ' = ' . $db->quote($url))
 				->set($db->quoteName('modified_date') . ' = ' . $db->quote($date))
+				->set($db->quoteName('published') . ' = ' . 1)
 				->where($db->quoteName('id') . ' IN (' . implode(',', $pks) . ')');
 
 			if (!empty($comment))

administrator/components/com_users/views/notes/tmpl/default.php

@@ -91,7 +91,7 @@
 						<?php if ($item->checked_out) : ?>
 							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'notes.', $canCheckin); ?>
 						<?php endif; ?>
-						<?php $subject = $item->subject ? $this->escape($item->subject) : JText::_('COM_USERS_EMPTY_SUBJECT'); ?>
+						<?php $subject = $item->subject ? $item->subject : JText::_('COM_USERS_EMPTY_SUBJECT'); ?>
 						<?php if ($canEdit) : ?>
 							<a href="<?php echo JRoute::_('index.php?option=com_users&task=note.edit&id=' . $item->id); ?>"><?php echo $this->escape($subject); ?></a>
 						<?php else : ?>

administrator/language/en-GB/en-GB.com_installer.ini

@@ -67,8 +67,8 @@ COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
 COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
 COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
 COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add "Install from Web" tab"
-COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class="_QQ_"alert-link"_QQ_" href="_QQ_"http://extensions.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://docs.joomla.org/Install_from_Web"_QQ_" target="_QQ_"_blank"_QQ_">Install from Web</a> on this page."
-COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED <a class="_QQ_"alert-link"_QQ_" href="_QQ_"http://extensions.joomla.org/tos"_QQ_" target="_QQ_"_blank"_QQ_">Terms of Service</a> and all applicable third party license terms."
+COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://docs.joomla.org/Install_from_Web"_QQ_" target="_QQ_"_blank"_QQ_">Install from Web</a> on this page."
+COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org/tos"_QQ_" target="_QQ_"_blank"_QQ_">Terms of Service</a> and all applicable third party license terms."
 COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the <strong>%s</strong> language was successful."
 COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
 COM_INSTALLER_INSTALL_URL="Install URL"

administrator/language/en-GB/en-GB.com_users.ini

@@ -32,8 +32,8 @@ COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users are allo
 COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
 COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration."
 COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
-COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Login name when editing their profile."
-COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Login Name"
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Username when editing their profile."
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Username"
 COM_USERS_CONFIG_FIELD_EMAIL_REGEX_LABEL="Forbidden domains"
 COM_USERS_CONFIG_FIELD_EMAIL_REGEX_DESC="List of forbidden domain names. Place each domain name on a new line."
 COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC="If 'Frontend User Parameters' is set to 'Show', users will be able to select their Frontend language preference when registering."

administrator/modules/mod_menu/tmpl/default_enabled.php

@@ -376,7 +376,7 @@
 	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_DOCUMENTATION'), 'https://docs.joomla.org', 'class:help-docs', false, '_blank'));
 	$menu->addSeparator();
 
-	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank'));
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank'));
 	$menu->addChild(
 		new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')
 	);

administrator/templates/hathor/html/mod_menu/default_enabled.php

@@ -348,7 +348,7 @@
 	$menu->addSeparator();
 
 	$menu->addChild(
-		new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'http://extensions.joomla.org', 'class:help-jed', false, '_blank')
+		new JMenuNode(JText::_('MOD_MENU_HELP_EXTENSIONS'), 'https://extensions.joomla.org', 'class:help-jed', false, '_blank')
 	);
 	$menu->addChild(
 		new JMenuNode(JText::_('MOD_MENU_HELP_TRANSLATIONS'), 'https://community.joomla.org/translations.html', 'class:help-trans', false, '_blank')

components/com_banners/models/banners.php

@@ -64,6 +64,7 @@ protected function getListQuery()
 		$keywords   = $this->getState('filter.keywords');
 		$randomise  = ($ordering == 'random');
 		$nullDate   = $db->quote($db->getNullDate());
+		$nowDate    = $db->quote(JFactory::getDate()->toSql());
 
 		$query->select(
 			'a.id as id,'
@@ -80,8 +81,8 @@ protected function getListQuery()
 			->from('#__banners as a')
 			->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid')
 			->where('a.state=1')
-			->where('(' . $query->currentTimestamp() . ' >= a.publish_up OR a.publish_up = ' . $nullDate . ')')
-			->where('(' . $query->currentTimestamp() . ' <= a.publish_down OR a.publish_down = ' . $nullDate . ')')
+			->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')')
 			->where('(a.imptotal = 0 OR a.impmade <= a.imptotal)');
 
 		if ($cid)

components/com_contact/views/contact/tmpl/default_form.php

@@ -12,23 +12,11 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.formvalidator');
 
-$captchaEnabled = false;
-
-$captchaSet = $this->params->get('captcha', JFactory::getApplication()->get('captcha', '0'));
-
-foreach (JPluginHelper::getPlugin('captcha') as $plugin)
-{
-	if ($captchaSet === $plugin->name)
-	{
-		$captchaEnabled = true;
-		break;
-	}
-}
 ?>
 <div class="contact-form">
 	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">
 		<?php foreach ($this->form->getFieldsets() as $fieldset): ?>
-			<?php if ($fieldset->name === 'captcha' && !$captchaEnabled) : ?>
+			<?php if ($fieldset->name === 'captcha' && !$this->captchaEnabled) : ?>
 				<?php continue; ?>
 			<?php endif; ?>
 			<?php $fields = $this->form->getFieldset($fieldset->name); ?>

components/com_contact/views/contact/view.html.php

@@ -49,6 +49,14 @@ class ContactViewContact extends JViewLegacy
 	 */
 	protected $return_page;
 
+	/**
+	 * Should we show a captcha form for the submission of the contact request?
+	 *
+	 * @var   bool
+	 * @since __DEPLOY_VERSION__
+	 */
+	protected $captchaEnabled = false;
+
 	/**
 	 * Execute and display a template script.
 	 *
@@ -288,8 +296,19 @@ public function display($tpl = null)
 
 		$model = $this->getModel();
 		$model->hit();
-		$this->_prepareDocument();
 
+		$captchaSet = $params->get('captcha', JFactory::getApplication()->get('captcha', '0'));
+
+		foreach (JPluginHelper::getPlugin('captcha') as $plugin)
+		{
+			if ($captchaSet === $plugin->name)
+			{
+				$this->captchaEnabled = true;
+				break;
+			}
+		}
+
+		$this->_prepareDocument();
 		return parent::display($tpl);
 	}
 

components/com_modules/modules.php

@@ -10,11 +10,18 @@
 defined('_JEXEC') or die;
 
 // Load the required admin language files
-$lang = JFactory::getLanguage();
+$lang   = JFactory::getLanguage();
+$app    = JFactory::getApplication();
+$config = array();
 $lang->load('joomla', JPATH_ADMINISTRATOR);
 $lang->load('com_modules', JPATH_ADMINISTRATOR);
 
+if ($app->input->get('task') === 'module.orderPosition')
+{
+	$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+}
+
 // Trigger the controller
-$controller = JControllerLegacy::getInstance('Modules');
-$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller = JControllerLegacy::getInstance('Modules', $config);
+$controller->execute($app->input->get('task'));
 $controller->redirect();

installation/INSTALL

@@ -142,7 +142,7 @@ Use Admin to install and configure additional extensions, add users, select
 default language and much more.
 
 Note that additional community contributed extensions and languages are
-available at the Joomla! Extensions Directory (JED): http://extensions.joomla.org/
+available at the Joomla! Extensions Directory (JED): https://extensions.joomla.org/
 
 You can also install and use the `Install from Web Tab` to access the JED
 directly from the Admin here: