Merge branch 'staging' into contact-user-groups

joomla · Dec 7, 2016 · 8ec6e25 · 8ec6e25
2 parents 2670895 + 57e6a4e
commit 8ec6e25
Show file tree

Hide file tree

Showing 136 changed files with 2,659 additions and 1,597 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
@@ -0,0 +1,3 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE `#__languages` DROP INDEX `idx_image`;
+ALTER TABLE `#__languages` ADD INDEX `idx_image` (`image`);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
@@ -0,0 +1,2 @@
+-- Normalize modules content field with other db systems. Add default value.
+ALTER TABLE `#__modules` MODIFY `content` text NOT NULL DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
@@ -0,0 +1,3 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE "#__languages" DROP CONSTRAINT "#__idx_image";
+CREATE INDEX "#__idx_image" ON "#__languages" ("image");
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-21.sql
@@ -0,0 +1,5 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE [#__languages] DROP CONSTRAINT [#__languages$idx_image];
+CREATE NONCLUSTERED INDEX [idx_image] ON [#__languages] (
+	[image] ASC
+) WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
@@ -12,7 +12,7 @@
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
 			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
 			id="purchase_type"
-			default="0"
+			default="1"
 			>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
 			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
@@ -50,8 +50,11 @@
 			type="text"
 			label="COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL"
 			description="COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC"
+			default=""
 		/>
+
 	</fieldset>
+
 	<fieldset
 		name="banners"
 		label="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL"
@@ -76,9 +79,10 @@
 			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
 			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
 			filter="integer"
-			default="5"
+			default="10"
 			showon="save_history:1"
 		/>
+
 	</fieldset>
 
 	<fieldset
@@ -96,5 +100,6 @@
 			component="com_banners"
 			section="component"
 		/>
+
 	</fieldset>
 </config>
diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php
@@ -111,7 +111,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.banner', $this->item->id);
 			}

diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php
@@ -19,7 +19,6 @@
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_banners.category');
 $saveOrder = $listOrder == 'a.ordering';
 
 if ($saveOrder)

diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php
@@ -118,7 +118,7 @@ protected function addToolbar()
 		}
 		else
 		{
-			if ($this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
 			{
 				JToolbarHelper::versions('com_banners.client', $this->item->id);
 			}

diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php
@@ -203,7 +203,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('category.save2copy');
 			}
 
-			if ($componentParams->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $componentParams->get('save_history', 0) && $itemEditable)
 			{
 				$typeAlias = $extension . '.category';
 				JToolbarHelper::versions($typeAlias, $this->item->id);

diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php
@@ -136,7 +136,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('contact.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
 				JToolbarHelper::versions('com_contact.contact', $this->item->id);
 			}

diff --git a/administrator/components/com_content/models/forms/filter_articles.xml b/administrator/components/com_content/models/forms/filter_articles.xml
@@ -110,6 +110,10 @@
 			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.created ASC">JDATE_ASC</option>
 			<option value="a.created DESC">JDATE_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
 			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
 			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
 			<option value="rating_count ASC" requires="vote">JGLOBAL_VOTES_ASC</option>

diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml
@@ -101,6 +101,10 @@
 			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
 			<option value="a.created_by ASC">JAUTHOR_ASC</option>
 			<option value="a.created_by DESC">JAUTHOR_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
 			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
 			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.created ASC">JDATE_ASC</option>

diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php
@@ -153,7 +153,7 @@ protected function addToolbar()
 				JToolbarHelper::save2copy('article.save2copy');
 			}
 
-			if ($this->state->params->get('save_history', 0) && $itemEditable)
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
 			{
 				JToolbarHelper::versions('com_content.article', $this->item->id);
 			}

diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php
@@ -23,6 +23,19 @@
 $saveOrder = $listOrder == 'a.ordering';
 $columns   = 10;
 
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_content&task=articles.saveOrderAjax&tmpl=component';
@@ -81,7 +94,7 @@
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
@@ -202,7 +215,10 @@
 							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 						</td>
 						<td class="nowrap small hidden-phone">
-							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+							<?php
+							$date = $item->{$orderingColumn};
+							echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+							?>
 						</td>
 						<td class="hidden-phone center">
 							<span class="badge badge-info">

diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php
@@ -19,10 +19,22 @@
 $userId    = $user->get('id');
 $listOrder = str_replace(' ' . $this->state->get('list.direction'), '', $this->state->get('list.fullordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$canOrder  = $user->authorise('core.edit.state', 'com_content.article');
 $saveOrder = $listOrder == 'fp.ordering';
 $columns   = 10;
 
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
 if ($saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component';
@@ -73,7 +85,7 @@
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
 						</th>
 						<th width="1%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
@@ -188,8 +200,10 @@
 								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 							</td>
 							<td class="nowrap small hidden-phone">
-								<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
-							</td>
+								<?php
+								$date = $item->{$orderingColumn};
+								echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+								?>							</td>
 							<td class="center hidden-phone">
 								<span class="badge badge-info">
 								<?php echo (int) $item->hits; ?>

diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
@@ -134,7 +134,7 @@ public static function getFields($context, $item = null, $prepareValue = false,
 					$field->value = self::$fieldCache->getFieldValue($field->id, $field->context, $item->id);
 				}
 
-				if (! $field->value)
+				if ($field->value == '')
 				{
 					$field->value = $field->default_value;
 				}
@@ -192,7 +192,7 @@ public static function getFields($context, $item = null, $prepareValue = false,
 	 */
 	public static function render($context, $layoutFile, $displayData)
 	{
-		$value = null;
+		$value = '';
 
 		/*
 		 * Because the layout refreshes the paths before the render function is
@@ -207,13 +207,13 @@ public static function render($context, $layoutFile, $displayData)
 			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => $parts[0], 'client' => 0));
 		}
 
-		if (!$value)
+		if ($value == '')
 		{
 			// Trying to render the layout on Fields itself
 			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => 'com_fields','client' => 0));
 		}
 
-		if (!$value)
+		if ($value == '')
 		{
 			// Trying to render the layout of the plugins
 			foreach (JFolder::listFolderTree(JPATH_PLUGINS . '/fields', '.', 1) as $folder)

diff --git a/administrator/components/com_fields/views/fields/tmpl/default.php b/administrator/components/com_fields/views/fields/tmpl/default.php
@@ -178,11 +178,7 @@
 								<?php echo $this->escape($item->access_level); ?>
 							</td>
 							<td class="small nowrap hidden-phone">
-								<?php if ($item->language == '*') : ?>
-									<?php echo JText::alt('JALL', 'language'); ?>
-								<?php else : ?>
-									<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
-								<?php endif; ?>
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
 							</td>
 							<td class="center hidden-phone">
 								<span><?php echo (int) $item->id; ?></span>

diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -538,8 +538,16 @@ public function optimize()
 			$db->execute();
 		}
 
-		// Optimize the terms mapping table.
-		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_links_terms'));
+		// Optimize the filters table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_filters'));
+		$db->execute();
+
+		// Optimize the terms common table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_terms_common'));
+		$db->execute();
+
+		// Optimize the types table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_types'));
 		$db->execute();
 
 		// Remove the orphaned taxonomy nodes.
@@ -549,6 +557,10 @@ public function optimize()
 		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy_map'));
 		$db->execute();
 
+		// Optimize the taxonomy table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy'));
+		$db->execute();
+
 		return true;
 	}
 

diff --git a/administrator/components/com_installer/models/warnings.php b/administrator/components/com_installer/models/warnings.php
@@ -33,21 +33,41 @@ class InstallerModelWarnings extends JModelList
 	 */
 	public function return_bytes($val)
 	{
+		if (empty($val))
+		{
+			return 0;
+		}
+
 		$val = trim($val);
-		$last = strtolower($val{strlen($val) - 1});
 
-		switch ($last)
+		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
+
+		$last = '';
+
+		if (isset($matches[2]))
+		{
+			$last = $matches[2];
+		}
+
+		if (isset($matches[1]))
+		{
+			$val = (int) $matches[1];
+		}
+
+		switch (strtolower($last))
 		{
-			// The 'G' modifier is available since PHP 5.1.0
 			case 'g':
+			case 'gb':
 				$val *= 1024;
 			case 'm':
+			case 'mb':
 				$val *= 1024;
 			case 'k':
+			case 'kb':
 				$val *= 1024;
 		}
 
-		return $val;
+		return (int) $val;
 	}
 
 	/**

diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.php b/administrator/components/com_installer/views/warnings/tmpl/default.php
@@ -22,7 +22,7 @@
 		<?php if (count($this->messages)) : ?>
 			<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning0')); ?>
 				<?php $i = 0; ?>
-				<?php foreach($this->messages as $message) : ?>
+				<?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'); ?>

diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
@@ -259,8 +259,10 @@ public function download()
 			$packageURL = $headers['Location'];
 			$headers    = get_headers($packageURL, 1);
 		}
+
 		// Remove protocol, path and query string from URL
 		$basename = basename($packageURL);
+
 		if (strpos($basename, '?') !== false)
 		{
 			$basename = substr($basename, 0, strpos($basename, '?'));

diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-	<fieldset name="component">
+	<fieldset 
+		name="component"
+		label="COM_MEDIA_FIELDSET_OPTIONS_LABEL">
 		<field
 			name="upload_extensions"
 			type="text"