Revert "Merge branch 'staging' of https://github.com/wmchris/joomla-cms…

… into staging"

This reverts commit b837ff6, reversing
changes made to c9a956a.

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,5 +3,3 @@ Pull Request for Issue # .
 #### Summary of Changes
 
 #### Testing Instructions
-
-#### Documentation Changes Required

.gitignore

@@ -18,6 +18,16 @@
 
 # Test Related Files #
 /phpunit.xml
+/tests/system/webdriver/tests/logs/
+/tests/system/servers/configdef.php
+codecept.phar
+tests/codeception/_output/*
+tests/codeception/vendor/*
+tests/codeception/testingsite*
+tests/codeception/tests/acceptance.suite.yml
+tests/codeception/tests/acceptance/*Tester.php
+tests/codeception/tests/functional/*Tester.php
+tests/codeception/tests/unit/*Tester.php
 
 # phpDocumentor Logs #
 phpdoc-*

administrator/components/com_admin/views/profile/tmpl/edit.php

@@ -55,7 +55,7 @@
 			continue;
 		}
 		?>
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', $fieldset->name, JText::_($fieldset->label)); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', $fieldset->name, JText::_($fieldset->label, true)); ?>
 		<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
 			<?php if ($field->hidden) : ?>
 				<div class="control-group">

administrator/components/com_checkin/models/checkin.php

@@ -238,7 +238,6 @@ public function getItems()
 
 			// Pagination
 			$limit = (int) $this->getState('list.limit');
-
 			if ($limit !== 0)
 			{
 				$this->items = array_slice($results, $this->getState('list.start'), $limit);

administrator/components/com_content/controllers/article.php

@@ -86,12 +86,6 @@ protected function allowEdit($data = array(), $key = 'id')
 		$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))
-		{
-			return false;
-		}
-
 		// Check general edit permission first.
 		if ($user->authorise('core.edit', 'com_content.article.' . $recordId))
 		{
@@ -104,7 +98,6 @@ protected function allowEdit($data = array(), $key = 'id')
 		{
 			// Now test the owner is the user.
 			$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
-
 			if (empty($ownerId) && $recordId)
 			{
 				// Need to do a lookup from the model.
@@ -118,14 +111,15 @@ protected function allowEdit($data = array(), $key = 'id')
 				$ownerId = $record->created_by;
 			}
 
-			// If the owner matches 'me' then permission is granted.
+			// If the owner matches 'me' then do the test.
 			if ($ownerId == $userId)
 			{
 				return true;
 			}
 		}
 
-		return false;
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
 	}
 
 	/**

administrator/components/com_joomlaupdate/controllers/update.php

@@ -25,8 +25,6 @@ class JoomlaupdateControllerUpdate extends JControllerLegacy
 	 */
 	public function download()
 	{
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
-
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -45,7 +43,7 @@ public function download()
 		if ($file)
 		{
 			JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file);
-			$url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+			$url = 'index.php?option=com_joomlaupdate&task=update.install';
 			JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), JLog::INFO, 'Update');
 		}
 		else
@@ -67,8 +65,6 @@ public function download()
 	 */
 	public function install()
 	{
-		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -94,8 +90,6 @@ public function install()
 	 */
 	public function finalise()
 	{
-		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -107,7 +101,7 @@ public function finalise()
 
 		$model->finaliseUpgrade();
 
-		$url = 'index.php?option=com_joomlaupdate&task=update.cleanup&' . JFactory::getSession()->getFormToken() . '=1';
+		$url = 'index.php?option=com_joomlaupdate&task=update.cleanup';
 		$this->setRedirect($url);
 	}
 
@@ -120,8 +114,6 @@ public function finalise()
 	 */
 	public function cleanup()
 	{
-		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
-
 		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
 		$options['text_file'] = 'joomla_update.php';
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
@@ -281,7 +273,7 @@ public function confirm()
 		JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $tempFile), JLog::INFO, 'Update');
 
 		// Redirect to the actual update page
-		$url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+		$url = 'index.php?option=com_joomlaupdate&task=update.install';
 		$this->setRedirect($url);
 	}
 

administrator/components/com_joomlaupdate/joomlaupdate.xml

@@ -7,7 +7,7 @@
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.6.2</version>
+	<version>3.6.0</version>
 	<description>COM_JOOMLAUPDATE_XML_DESCRIPTION</description>
 	<media destination="com_joomlaupdate" folder="media">
 		<folder>js</folder>

administrator/components/com_joomlaupdate/models/default.php

@@ -389,7 +389,7 @@ public function createRestorationFile($basename = null)
 			$ftp_host = $app->input->get('ftp_host', '');
 			$ftp_port = $app->input->get('ftp_port', '21');
 			$ftp_user = $app->input->get('ftp_user', '');
-			$ftp_pass = addcslashes($app->input->get('ftp_pass', '', 'raw'), "'\\");
+			$ftp_pass = $app->input->get('ftp_pass', '', 'raw');
 			$ftp_root = $app->input->get('ftp_root', '');
 
 			// Is the tempdir really writable?

administrator/components/com_joomlaupdate/views/update/tmpl/default.php

@@ -20,7 +20,7 @@
 $password = JFactory::getApplication()->getUserState('com_joomlaupdate.password', null);
 $filesize = JFactory::getApplication()->getUserState('com_joomlaupdate.filesize', null);
 $ajaxUrl = JUri::base() . 'components/com_joomlaupdate/restore.php';
-$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . JFactory::getSession()->getFormToken() . '=1';
+$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise';
 
 JFactory::getDocument()->addScriptDeclaration(
 	"

administrator/components/com_plugins/views/plugin/tmpl/edit_options.php

@@ -13,7 +13,7 @@
 {
 	if (!isset($fieldset->repeat) || isset($fieldset->repeat) && $fieldset->repeat == false)
 	{
-		$label = !empty($fieldset->label) ? JText::_($fieldset->label) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true);
+		$label = !empty($fieldset->label) ? JText::_($fieldset->label, true) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true);
 		$optionsname = 'options-' . $fieldset->name;
 		echo JHtml::_('bootstrap.addTab', 'myTab', $optionsname,  $label);
 

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

@@ -148,7 +148,7 @@
 							<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
 						</td>
 						<td class="hidden-phone hidden-tablet">
-							<?php if ($item->lastvisitDate != $this->db->getNullDate()):?>
+							<?php if ($item->lastvisitDate != '0000-00-00 00:00:00'):?>
 								<?php echo JHtml::_('date', $item->lastvisitDate, 'Y-m-d H:i:s'); ?>
 							<?php else:?>
 								<?php echo JText::_('JNEVER'); ?>

administrator/components/com_users/views/users/view.html.php

@@ -39,38 +39,6 @@ class UsersViewUsers extends JViewLegacy
 	 * @since 1.6
 	 */
 	protected $state;
-
-	/**
-	 * A JForm instance with filter fields.
-	 *
-	 * @var    JForm
-	 * @since  3.6
-	 */
-	 public $filterForm;
-
-	/**
-	 * An array with active filters.
-	 *
-	 * @var    array
-	 * @since  3.6
-	 */
-	public $activeFilters;
-
-	/**
-	 * An ACL object to verify user rights.
-	 *
-	 * @var    JObject
-	 * @since  3.6
-	 */
-	 protected $canDo;
-
-	/**
-	 * An instance of JDatabaseDriver.
-	 *
-	 * @var    JDatabaseDriver
-	 * @since  3.6
-	 */
-	 protected $db;
 
 	/**
 	 * Display the view
@@ -87,7 +55,6 @@ public function display($tpl = null)
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
 		$this->canDo         = JHelperContent::getActions('com_users');
-		$this->db            = JFactory::getDbo();
 
 		UsersHelper::addSubmenu('users');
 

administrator/language/en-GB/en-GB.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="administrator">
 	<name>English (en-GB)</name>
-	<version>3.6.3</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.1</version>
+	<creationDate>July 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/install.xml

@@ -2,8 +2,8 @@
 <extension version="3.6" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.6.3</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.1</version>
+	<creationDate>July 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/manifests/files/joomla.xml

@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.3-dev</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.1-rc2</version>
+	<creationDate>July 2016</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -2,8 +2,8 @@
 <extension type="package" version="3.6" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>3.6.3.1</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.1.1</version>
+	<creationDate>July 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/templates/hathor/html/com_users/users/default.php

@@ -190,7 +190,7 @@
 					<?php echo $this->escape($item->email); ?>
 				</td>
 				<td class="center">
-					<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
+					<?php if ($item->lastvisitDate != '0000-00-00 00:00:00') : ?>
 						<?php echo JHtml::_('date', $item->lastvisitDate, 'Y-m-d H:i:s'); ?>
 					<?php else:?>
 						<?php echo JText::_('JNEVER'); ?>

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

@@ -171,7 +171,7 @@
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', JText::_('COM_CONTACT_PROFILE')); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', JText::_('COM_CONTACT_PROFILE', true)); ?>
 		<?php endif; ?>
 		<?php if ($this->params->get('presentation_style') == 'plain'):?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_PROFILE') . '</h3>';  ?>

components/com_content/views/featured/tmpl/default_item.php

@@ -95,7 +95,7 @@
 <?php endif; ?>
 
 <?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
-	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != $this->db->getNullDate() )) : ?>
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 	</div>
 <?php endif; ?>
 

components/com_content/views/featured/view.html.php

@@ -31,14 +31,6 @@ class ContentViewFeatured extends JViewLegacy
 	protected $link_items = array();
 
 	protected $columns = 1;
-
-	/**
-	 * An instance of JDatabaseDriver.
-	 *
-	 * @var    JDatabaseDriver
-	 * @since  3.6
-	 */
-	 protected $db;
 
 	/**
 	 * Execute and display a template script.
@@ -70,6 +62,7 @@ public function display($tpl = null)
 		// Get the metrics for the structural page layout.
 		$numLeading = (int) $params->def('num_leading_articles', 1);
 		$numIntro   = (int) $params->def('num_intro_articles', 4);
+		$numLinks   = (int) $params->def('num_links', 4);
 
 		// Compute the article slugs and prepare introtext (runs content plugins).
 		foreach ($items as &$item)
@@ -152,7 +145,6 @@ public function display($tpl = null)
 		$this->items      = &$items;
 		$this->pagination = &$pagination;
 		$this->user       = &$user;
-		$this->db         = JFactory::getDbo();
 
 		$this->_prepareDocument();
 

components/com_mailto/views/mailto/tmpl/default.php

@@ -66,7 +66,7 @@
 				<?php echo JText::_('COM_MAILTO_CANCEL'); ?>
 			</button>
 		</p>
-		<input type="hidden" name="layout" value="<?php echo htmlspecialchars($this->getLayout(), ENT_COMPAT, 'UTF-8'); ?>" />
+		<input type="hidden" name="layout" value="<?php echo $this->getLayout();?>" />
 		<input type="hidden" name="option" value="com_mailto" />
 		<input type="hidden" name="task" value="send" />
 		<input type="hidden" name="tmpl" value="component" />

components/com_users/views/profile/tmpl/default_core.php

@@ -38,7 +38,7 @@
 			<?php echo JText::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
 		</dt>
 
-		<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
+		<?php if ($this->data->lastvisitDate != '0000-00-00 00:00:00') : ?>
 			<dd>
 				<?php echo JHtml::_('date', $this->data->lastvisitDate); ?>
 			</dd>

components/com_users/views/profile/view.html.php

@@ -24,14 +24,6 @@ class UsersViewProfile extends JViewLegacy
 
 	protected $state;
 
-	/**
-	 * An instance of JDatabaseDriver.
-	 *
-	 * @var    JDatabaseDriver
-	 * @since  3.6
-	 */
-	protected $db;
-
 	/**
 	 * Execute and display a template script.
 	 *
@@ -51,7 +43,6 @@ public function display($tpl = null)
 		$this->twofactorform    = $this->get('Twofactorform');
 		$this->twofactormethods = UsersHelper::getTwoFactorMethods();
 		$this->otpConfig        = $this->get('OtpConfig');
-		$this->db               = JFactory::getDbo();
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))

installation/language/ar-AA/ar-AA.ini

@@ -30,7 +30,6 @@ INSTL_PRECHECK_ACTUAL="حالياً"
 
 ; Database view
 INSTL_DATABASE="تهيئة قاعدة البيانات"
-INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="خطأ عند استعلام قاعدة البيانات PostgreSQL."
 INSTL_DATABASE_HOST_DESC="هذا عادة يكون "localhost""
 INSTL_DATABASE_HOST_LABEL="اسم الموقع"
 INSTL_DATABASE_NAME_DESC="بعض مزودي الاستضافة يسمحون فقط باستخدام اسم قاعدة بيانات محددة لكل موقع. استخدم بادئة الجدول للتمييز بين أكثر من موقع جوملا!."

installation/language/ar-AA/ar-AA.xml

@@ -3,8 +3,8 @@
 	version="3.6"
 	client="installation">
 	<name>Arabic Unitag (العربية الموحدة)</name>
-	<version>3.6.1</version>
-	<creationDate>August 2016</creationDate>
+	<version>3.6.0</version>
+	<creationDate>April 2016</creationDate>
 	<author>Joomla! Arabic Unitag Translation team</author>
 	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>