From fe3b1cb4798ff197cadfa5c00dae359bd097e0bf Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Mon, 3 Oct 2016 17:58:51 +0300
Subject: [PATCH 1/7] Cleanups, fixes and a bit of optimizations for
 site/components batch #3

- com_content

Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole
---
 components/com_content/controller.php         |  8 ++---
 .../com_content/controllers/article.php       |  1 -
 .../com_content/helpers/association.php       |  6 ++--
 components/com_content/helpers/icon.php       |  8 ++---
 components/com_content/helpers/query.php      |  4 +--
 components/com_content/helpers/route.php      | 14 ++++-----
 components/com_content/models/article.php     |  4 +--
 components/com_content/models/articles.php    | 12 ++++----
 components/com_content/models/category.php    |  7 +++--
 components/com_content/models/form.php        |  6 ++--
 components/com_content/router.php             | 29 +++++++++----------
 .../views/archive/tmpl/default.php            |  2 +-
 .../views/archive/tmpl/default_items.php      |  2 +-
 .../com_content/views/archive/view.html.php   | 12 ++++----
 .../views/article/tmpl/default.php            |  6 ++--
 .../views/article/tmpl/default_links.php      |  4 +--
 .../com_content/views/article/view.html.php   | 10 +++----
 .../views/categories/tmpl/default_items.php   |  6 ++--
 .../com_content/views/category/tmpl/blog.php  |  8 ++---
 .../views/category/tmpl/blog_children.php     |  8 ++---
 .../views/category/tmpl/default_articles.php  | 14 ++++-----
 .../views/category/tmpl/default_children.php  |  6 ++--
 .../com_content/views/category/view.feed.php  |  2 +-
 .../com_content/views/category/view.html.php  | 10 +++----
 .../views/featured/tmpl/default.php           |  6 ++--
 .../com_content/views/featured/view.feed.php  |  4 +--
 .../com_content/views/featured/view.html.php  |  6 ++--
 .../com_content/views/form/tmpl/edit.php      |  4 +--
 .../com_content/views/form/view.html.php      |  4 +--
 29 files changed, 103 insertions(+), 110 deletions(-)

diff --git a/components/com_content/controller.php b/components/com_content/controller.php
index ae86b40a271b4..efaf6c087d4ca 100644
--- a/components/com_content/controller.php
+++ b/components/com_content/controller.php
@@ -70,8 +70,8 @@ public function display($cachable = false, $urlparams = false)
 		$user = JFactory::getUser();
 
 		if ($user->get('id')
-			|| ($this->input->getMethod() == 'POST'
-			&& (($vName == 'category' && $this->input->get('layout') != 'blog') || $vName == 'archive' )))
+			|| ($this->input->getMethod() === 'POST'
+			&& (($vName === 'category' && $this->input->get('layout') !== 'blog') || $vName === 'archive' )))
 		{
 			$cachable = false;
 		}
@@ -95,13 +95,13 @@ public function display($cachable = false, $urlparams = false)
 			'Itemid' => 'INT');
 
 		// Check for edit form.
-		if ($vName == 'form' && !$this->checkEditId('com_content.edit.article', $id))
+		if ($vName === 'form' && !$this->checkEditId('com_content.edit.article', $id))
 		{
 			// Somehow the person just went to the form - we don't allow that.
 			return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
 		}
 
-		if ($vName == 'article')
+		if ($vName === 'article')
 		{
 			// Get/Create the model
 			if ($model = $this->getModel($vName))
diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
index be4ebf16b112d..a86c062355348 100644
--- a/components/com_content/controllers/article.php
+++ b/components/com_content/controllers/article.php
@@ -286,7 +286,6 @@ protected function getReturnPage()
 	 */
 	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
-		return;
 	}
 
 	/**
diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php
index 278cdbeb5e8b5..bea3aca6295b8 100644
--- a/components/com_content/helpers/association.php
+++ b/components/com_content/helpers/association.php
@@ -33,10 +33,10 @@ abstract class ContentHelperAssociation extends CategoryHelperAssociation
 	public static function getAssociations($id = 0, $view = null)
 	{
 		$jinput = JFactory::getApplication()->input;
-		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
-		if ($view == 'article')
+		if ($view === 'article')
 		{
 			if ($id)
 			{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
 			}
 		}
 
-		if ($view == 'category' || $view == 'categories')
+		if ($view === 'category' || $view === 'categories')
 		{
 			return self::getCategoryAssociations($id, 'com_content');
 		}
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index a0a034fca05f6..84eb0d5332ed0 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -55,7 +55,7 @@ public static function create($category, $params, $attribs = array(), $legacy =
 		// Add the button classes to the attribs array
 		if (isset($attribs['class']))
 		{
-			$attribs['class'] = $attribs['class'] . ' btn btn-primary';
+			$attribs['class'] .= ' btn btn-primary';
 		}
 		else
 		{
@@ -111,9 +111,7 @@ public static function email($article, $params, $attribs = array(), $legacy = fa
 		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
 		$attribs['rel']     = 'nofollow';
 
-		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
-
-		return $output;
+		return JHtml::_('link', JRoute::_($url), $text, $attribs);
 	}
 
 	/**
@@ -190,7 +188,7 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 		}
 
 		$date   = JHtml::_('date', $article->created);
-		$author = $article->created_by_alias ? $article->created_by_alias : $article->author;
+		$author = $article->created_by_alias ?: $article->author;
 
 		$overlib .= '&lt;br /&gt;';
 		$overlib .= $date;
diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php
index bcb789bc03142..4b4d25247eaeb 100644
--- a/components/com_content/helpers/query.php
+++ b/components/com_content/helpers/query.php
@@ -180,9 +180,7 @@ public static function buildVotingQuery($params = null)
 			$join = '';
 		}
 
-		$results = array ('select' => $select, 'join' => $join);
-
-		return $results;
+		return array ('select' => $select, 'join' => $join);
 	}
 
 	/**
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index 5dece4143a292..be3434a5f7681 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -51,7 +51,7 @@ public static function getArticleRoute($id, $catid = 0, $language = 0)
 			}
 		}
 
-		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -100,7 +100,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category']   = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
@@ -164,7 +164,7 @@ protected static function _findItem($needles = null)
 			$attributes = array('component_id');
 			$values     = array($component->id);
 
-			if ($language != '*')
+			if ($language !== '*')
 			{
 				$attributes[] = 'language';
 				$values[]     = array($needles['language'], '*');
@@ -174,7 +174,7 @@ protected static function _findItem($needles = null)
 
 			foreach ($items as $item)
 			{
-				if (isset($item->query) && isset($item->query['view']))
+				if (isset($item->query, $item->query['view']))
 				{
 					$view = $item->query['view'];
 
@@ -190,7 +190,7 @@ protected static function _findItem($needles = null)
 						 * language != * can override existing entries
 						 * language == * cannot override existing entries
 						 */
-						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						if ($item->language !== '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
@@ -220,8 +220,8 @@ protected static function _findItem($needles = null)
 		$active = $menus->getActive();
 
 		if ($active
-			&& $active->component == 'com_content'
-			&& ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+			&& $active->component === 'com_content'
+			&& ($language === '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php
index b72a4de0a3b40..29addb74d8781 100644
--- a/components/com_content/models/article.php
+++ b/components/com_content/models/article.php
@@ -164,7 +164,7 @@ public function getItem($pk = null)
 				}
 
 				// Check for published state if filter set.
-				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->state != $published) && ($data->state != $archived)))
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->state != $published) && ($data->state != $archived)))
 				{
 					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
 				}
@@ -333,7 +333,7 @@ public function storeVote($pk = 0, $rate = 0)
 			}
 			else
 			{
-				if ($userIP != ($rating->lastip))
+				if ($userIP != $rating->lastip)
 				{
 					$query = $db->getQuery(true);
 
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index 15d0fa8f61967..813e81a0541e0 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -224,7 +224,7 @@ protected function getListQuery()
 		// Join over the frontpage articles if required.
 		if ($this->getState('filter.frontpage'))
 		{
-			if ($orderby_sec == 'front')
+			if ($orderby_sec === 'front')
 			{
 				$query->join('INNER', '#__content_frontpage AS fp ON fp.content_id = a.id');
 			}
@@ -233,7 +233,7 @@ protected function getListQuery()
 				$query->where('a.featured = 1');
 			}
 		}
-		elseif ($orderby_sec == 'front' || $this->getState('list.ordering') == 'fp.ordering')
+		elseif ($orderby_sec === 'front' || $this->getState('list.ordering') === 'fp.ordering')
 		{
 			$query->join('LEFT', '#__content_frontpage AS fp ON fp.content_id = a.id');
 		}
@@ -244,7 +244,7 @@ protected function getListQuery()
 
 		// Join over the users for the author and modified_by names.
 		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
-			->select("ua.email AS author_email")
+			->select('ua.email AS author_email')
 
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
 			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
@@ -498,7 +498,7 @@ protected function getListQuery()
 		}
 
 		// Process the filter for list views with user-entered filters
-		if ((is_object($params)) && ($params->get('filter_field') != 'hide') && ($filter = $this->getState('list.filter')))
+		if (is_object($params) && ($params->get('filter_field') !== 'hide') && ($filter = $this->getState('list.filter')))
 		{
 			// Clean filter variable
 			$filter = JString::strtolower($filter);
@@ -587,8 +587,8 @@ public function getItems()
 			/*For blogs, article params override menu item params only if menu param = 'use_article'
 			Otherwise, menu item params control the layout
 			If menu item is 'use_article' and there is no article param, use global*/
-			if (($input->getString('layout') == 'blog') || ($input->getString('view') == 'featured')
-				|| ($this->getState('params')->get('layout_type') == 'blog'))
+			if (($input->getString('layout') === 'blog') || ($input->getString('view') === 'featured')
+				|| ($this->getState('params')->get('layout_type') === 'blog'))
 			{
 				// Create an array of just the params set to 'use_article'
 				$menuParamsArray = $this->getState('params')->toArray();
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index 5906a59c090e1..a2035f7d10160 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -187,7 +187,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
 
 		// Set limit for query. If list, use parameter. If blog, add blog parameters for limit.
-		if (($app->input->get('layout') == 'blog') || $params->get('layout_type') == 'blog')
+		if (($app->input->get('layout') === 'blog') || $params->get('layout_type') === 'blog')
 		{
 			$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
 			$this->setState('list.links', $params->get('num_links'));
@@ -457,9 +457,10 @@ public function &getChildren()
 		{
 			$params = $this->getState()->get('params');
 
-			if ($params->get('orderby_pri') == 'alpha' || $params->get('orderby_pri') == 'ralpha')
+			$orderByPri = $params->get('orderby_pri');
+			if ($orderByPri === 'alpha' || $orderByPri === 'ralpha')
 			{
-				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : (-1));
+				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') === 'alpha') ? 1 : (-1));
 			}
 		}
 
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index c39be47a16b08..3833b225e8a34 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -179,17 +179,15 @@ public function getReturnPage()
 	public function save($data)
 	{
 		// Associations are not edited in frontend ATM so we have to inherit them
-		if (JLanguageAssociations::isEnabled() && !empty($data['id']))
+		if (JLanguageAssociations::isEnabled() && !empty($data['id'])
+			&& $associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
 		{
-			if ($associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
-			{
 				foreach ($associations as $tag => $associated)
 				{
 					$associations[$tag] = (int) $associated->id;
 				}
 
 				$data['associations'] = $associations;
-			}
 		}
 
 		return parent::save($data);
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 9a7ef6e7583fa..c803e122081a8 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -52,7 +52,7 @@ public function build(&$query)
 		}
 
 		// Check again
-		if ($menuItemGiven && isset($menuItem) && $menuItem->component != 'com_content')
+		if ($menuItemGiven && isset($menuItem) && $menuItem->component !== 'com_content')
 		{
 			$menuItemGiven = false;
 			unset($query['Itemid']);
@@ -91,7 +91,7 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if ($view == 'category' || $view == 'article')
+		if ($view === 'category' || $view === 'article')
 		{
 			if (!$menuItemGiven)
 			{
@@ -100,9 +100,9 @@ public function build(&$query)
 
 			unset($query['view']);
 
-			if ($view == 'article')
+			if ($view === 'article')
 			{
-				if (isset($query['id']) && isset($query['catid']) && $query['catid'])
+				if (isset($query['id'], $query['catid']) && $query['catid'])
 				{
 					$catid = $query['catid'];
 
@@ -162,7 +162,7 @@ public function build(&$query)
 
 			foreach ($path as $id)
 			{
-				if ((int) $id == (int) $mCatid)
+				if ((int) $id === (int) $mCatid)
 				{
 					break;
 				}
@@ -181,7 +181,7 @@ public function build(&$query)
 
 			$segments = array_merge($segments, $array);
 
-			if ($view == 'article')
+			if ($view === 'article')
 			{
 				if ($advanced)
 				{
@@ -195,13 +195,12 @@ public function build(&$query)
 				$segments[] = $id;
 			}
 
-			unset($query['id']);
-			unset($query['catid']);
+			unset($query['id'], $query['catid']);
 		}
 
-		if ($view == 'archive')
+		if ($view === 'archive')
 		{
-			if (!$menuItemGiven || $menuItem->query['view'] != 'archive')
+			if (!$menuItemGiven || $menuItem->query['view'] !== 'archive')
 			{
 				// Did not work without removing Itemid
 				if (isset($menuItem))
@@ -227,7 +226,7 @@ public function build(&$query)
 			}
 		}
 
-		if ($view == 'featured')
+		if ($view === 'featured')
 		{
 			if (!$menuItemGiven)
 			{
@@ -252,7 +251,7 @@ public function build(&$query)
 			}
 			else
 			{
-				if ($query['layout'] == 'default')
+				if ($query['layout'] === 'default')
 				{
 					unset($query['layout']);
 				}
@@ -306,7 +305,7 @@ public function parse(&$segments)
 			$vars['view'] = $segments[0];
 
 			// Called if no menu item created
-			if ($vars['view'] == 'archive')
+			if ($vars['view'] === 'archive')
 			{
 				$vars['year']  = $count >= 2 ? $segments[$count - 2] : null;
 				$vars['month'] = $segments[$count - 1];
@@ -324,7 +323,7 @@ public function parse(&$segments)
 		 * We test it first to see if it is a category.  If the id and alias match a category,
 		 * then we assume it is a category.  If they don't we assume it is an article
 		 */
-		if ($count == 1)
+		if ($count === 1)
 		{
 			// We check to see if an alias is given.  If not, we assume it is an article
 			if (strpos($segments[0], ':') === false)
@@ -429,7 +428,7 @@ public function parse(&$segments)
 				}
 			}
 
-			if ($found == 0)
+			if ($found === 0)
 			{
 				if ($advanced)
 				{
diff --git a/components/com_content/views/archive/tmpl/default.php b/components/com_content/views/archive/tmpl/default.php
index f14093209c2e8..252e8710cbc78 100644
--- a/components/com_content/views/archive/tmpl/default.php
+++ b/components/com_content/views/archive/tmpl/default.php
@@ -24,7 +24,7 @@
 <form id="adminForm" action="<?php echo JRoute::_('index.php')?>" method="post" class="form-inline">
 	<fieldset class="filters">
 	<div class="filter-search">
-		<?php if ($this->params->get('filter_field') != 'hide') : ?>
+		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
 		<label class="filter-search-lbl element-invisible" for="filter-search"><?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL') . '&#160;'; ?></label>
 		<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox span2" onchange="document.getElementById('adminForm').submit();" placeholder="<?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL'); ?>" />
 		<?php endif; ?>
diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index 5ffaaedddd253..546d10a95f384 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -29,7 +29,7 @@
 				</h2>
 				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
 					<div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
-					<?php $author = ($item->created_by_alias) ? $item->created_by_alias : $item->author; ?>
+					<?php $author = $item->created_by_alias ?: $item->author; ?>
 					<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author, array('itemprop' => 'url'))); ?>
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index fba1f4b064596..cb76db1fddfd9 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -45,11 +45,11 @@ public function display($tpl = null)
 
 		foreach ($items as $item)
 		{
-			$item->catslug     = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
@@ -114,7 +114,7 @@ public function display($tpl = null)
 		$years = array();
 		$years[] = JHtml::_('select.option', null, JText::_('JYEAR'));
 
-		for ($i = 0; $i < count($this->years); $i++)
+		for ($i = 0, $iMax = count($this->years); $i < $iMax; $i++)
 		{
 			$years[] = JHtml::_('select.option', $this->years[$i], $this->years[$i]);
 		}
@@ -136,8 +136,8 @@ public function display($tpl = null)
 		$this->params     = &$params;
 		$this->user       = &$user;
 		$this->pagination = &$pagination;
-		$this->pagination->setAdditionalUrlParam("month", $state->get('filter.month'));
-		$this->pagination->setAdditionalUrlParam("year", $state->get('filter.year'));
+		$this->pagination->setAdditionalUrlParam('month', $state->get('filter.month'));
+		$this->pagination->setAdditionalUrlParam('year', $state->get('filter.year'));
 
 		$this->_prepareDocument();
 
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index a6e6de972ad4c..d9e2b217e1090 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -94,7 +94,7 @@
 	<?php endif; ?>
 	<?php if ($params->get('access-view')):?>
 	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
-	<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+	<?php $imgfloat = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
 	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
 	<?php if ($images->image_fulltext_caption):
 		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
@@ -151,13 +151,13 @@
 		elseif ($readmore = $attribs->alternative_readmore) :
 			echo $readmore;
 			if ($params->get('show_readmore_title', 0) != 0) :
-				echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+				echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
 			endif;
 		elseif ($params->get('show_readmore_title', 0) == 0) :
 			echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
 		else :
 			echo JText::_('COM_CONTENT_READ_MORE');
-			echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+			echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
 		endif; ?>
 		</a>
 	</p>
diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php
index 6aef351033479..f049c96e9e7de 100644
--- a/components/com_content/views/article/tmpl/default_links.php
+++ b/components/com_content/views/article/tmpl/default_links.php
@@ -35,10 +35,10 @@
 				endif;
 
 				// If no label is present, take the link
-				$label = ($label) ? $label : $link;
+				$label = $label ?: $link;
 
 				// If no target is present, use the default
-				$target = $target ? $target : $params->get('target' . $id);
+				$target = $target ?: $params->get('target' . $id);
 				?>
 			<li class="content-links-<?php echo $id; ?>">
 				<?php
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index d5caf988879ed..5c04b0754925f 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -62,7 +62,7 @@ public function display($tpl = null)
 		$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 		// No link for ROOT category
-		if ($item->parent_alias == 'root')
+		if ($item->parent_alias === 'root')
 		{
 			$item->parent_slug = null;
 		}
@@ -82,7 +82,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an article view for this article, then the menu item params take priority
-			if (strpos($currentLink, 'view=article') && (strpos($currentLink, '&id=' . (string) $item->id)))
+			if (strpos($currentLink, 'view=article') && strpos($currentLink, '&id=' . (string) $item->id))
 			{
 				// Load layout from active query (in case it is an alternative menu item)
 				if (isset($active->query['layout']))
@@ -208,7 +208,7 @@ protected function _prepareDocument()
 		$id = (int) @$menu->query['id'];
 
 		// If the menu item does not concern this article
-		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] != 'article' || $id != $this->item->id))
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] !== 'article' || $id != $this->item->id))
 		{
 			// If this is not a single article menu item, set the page title to the article title
 			if ($this->item->title)
@@ -219,7 +219,7 @@ protected function _prepareDocument()
 			$path     = array(array('title' => $this->item->title, 'link' => ''));
 			$category = JCategories::getInstance('Content')->get($this->item->catid);
 
-			while ($category && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			while ($category && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
 			{
 				$path[]   = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
@@ -279,7 +279,7 @@ protected function _prepareDocument()
 
 		if ($app->get('MetaAuthor') == '1')
 		{
-			$author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author;
+			$author = $this->item->created_by_alias ?: $this->item->author;
 			$this->document->setMetaData('author', $author);
 		}
 
diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index d524c4c5fdff3..26d53c8a9eb7b 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 $lang  = JFactory::getLanguage();
 
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
@@ -35,7 +35,7 @@
 						<?php echo $item->numitems; ?>
 					</span>
 				<?php endif; ?>
-				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<a id="category-btn-<?php echo $item->id;?>" href="#category-<?php echo $item->id;?>"
 						data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
@@ -51,7 +51,7 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) :?>
+			<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) :?>
 				<div class="collapse fade" id="category-<?php echo $item->id;?>">
 				<?php
 				$this->items[$item->id] = $item->getChildren();
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index cd4d0a0a6a899..1703ef765a744 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -67,18 +67,18 @@
 	<?php endif; ?>
 
 	<?php
-	$introcount = (count($this->intro_items));
+	$introcount = count($this->intro_items);
 	$counter = 0;
 	?>
 
 	<?php if (!empty($this->intro_items)) : ?>
 		<?php foreach ($this->intro_items as $key => &$item) : ?>
 			<?php $rowcount = ((int) $key % (int) $this->columns) + 1; ?>
-			<?php if ($rowcount == 1) : ?>
+			<?php if ($rowcount === 1) : ?>
 				<?php $row = $counter / $this->columns; ?>
 				<div class="items-row cols-<?php echo (int) $this->columns; ?> <?php echo 'row-' . $row; ?> row-fluid clearfix">
 			<?php endif; ?>
-			<div class="span<?php echo round((12 / $this->columns)); ?>">
+			<div class="span<?php echo round(12 / $this->columns); ?>">
 				<div class="item column-<?php echo $rowcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
 					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 					<?php
@@ -101,7 +101,7 @@
 		</div>
 	<?php endif; ?>
 
-	<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 		<div class="cat-children">
 			<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
 				<h3> <?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?> </h3>
diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php
index 52b9486ed6866..5d86a92de18ca 100644
--- a/components/com_content/views/category/tmpl/blog_children.php
+++ b/components/com_content/views/category/tmpl/blog_children.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 $lang  = JFactory::getLanguage();
 
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) : ?>
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
 
 	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
 		<?php
@@ -35,7 +35,7 @@
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -49,7 +49,7 @@
 					</span>
 				<?php endif; ?>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -63,7 +63,7 @@
 			<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 			<div class="collapse fade" id="category-<?php echo $child->id; ?>">
 				<?php
 				$this->children[$child->id] = $child->getChildren();
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index c6bc7f85b04cf..3fdc27954199a 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -34,11 +34,11 @@
 ?>
 
 <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
-<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) :?>
+<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) :?>
 	<fieldset class="filters btn-toolbar clearfix">
-		<?php if ($this->params->get('filter_field') != 'hide') :?>
+		<?php if ($this->params->get('filter_field') !== 'hide') :?>
 			<div class="btn-group">
-				<?php if ($this->params->get('filter_field') != 'tag') :?>
+				<?php if ($this->params->get('filter_field') !== 'tag') :?>
 					<label class="filter-search-lbl element-invisible" for="filter-search">
 						<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL') . '&#160;'; ?>
 					</label>
@@ -98,11 +98,11 @@
 				</th>
 				<?php if ($date = $this->params->get('list_show_date')) : ?>
 					<th id="categorylist_header_date">
-						<?php if ($date == "created") : ?>
+						<?php if ($date === 'created') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
-						<?php elseif ($date == "modified") : ?>
+						<?php elseif ($date === 'modified') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
-						<?php elseif ($date == "published") : ?>
+						<?php elseif ($date === 'published') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
 						<?php endif; ?>
 					</th>
@@ -177,7 +177,7 @@
 				<td <?php echo $headerAuthor; ?> class="list-author">
 					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 						<?php $author = $article->author ?>
-						<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
+						<?php $author = ($article->created_by_alias ?: $author);?>
 						<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 						<?php else: ?>
diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php
index 0515757e82439..f8ffba5a3b221 100644
--- a/components/com_content/views/category/tmpl/default_children.php
+++ b/components/com_content/views/category/tmpl/default_children.php
@@ -36,7 +36,7 @@
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -49,7 +49,7 @@
 					</span>
 				<?php endif; ?>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			<?php endif;?>
@@ -62,7 +62,7 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) :?>
+			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) :?>
 			<div class="collapse fade" id="category-<?php echo $child->id;?>">
 				<?php
 				$this->children[$child->id] = $child->getChildren();
diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index 0223547bd7f89..d13d0d45d03b4 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -51,6 +51,6 @@ protected function reconcileNames($item)
 			$item->description .= '<p class="feed-readmore"><a target="_blank" href ="' . $link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
 		}
 
-		$item->author = $item->created_by_alias ? $item->created_by_alias : $item->author;
+		$item->author = $item->created_by_alias ?: $item->author;
 	}
 }
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 4b65b92a0e292..1e56c16a6e7b4 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -83,10 +83,10 @@ public function display($tpl = null)
 		{
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
 
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
@@ -143,7 +143,7 @@ public function display($tpl = null)
 
 		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
 		// This makes it much easier for the designer to just interrogate the arrays.
-		if (($params->get('layout_type') == 'blog') || ($this->getLayout() == 'blog'))
+		if (($params->get('layout_type') === 'blog') || ($this->getLayout() === 'blog'))
 		{
 			foreach ($this->items as $i => $item)
 			{
@@ -269,12 +269,12 @@ protected function prepareDocument()
 		$menu = $this->menu;
 		$id = (int) @$menu->query['id'];
 
-		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $this->category->id))
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $this->category->id))
 		{
 			$path = array(array('title' => $this->category->title, 'link' => ''));
 			$category = $this->category->getParent();
 
-			while (($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 49aae30b0633e..bc777fc5b33f4 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -43,7 +43,7 @@
 </div>
 <?php endif; ?>
 <?php
-	$introcount = (count($this->intro_items));
+	$introcount = count($this->intro_items);
 	$counter = 0;
 ?>
 <?php if (!empty($this->intro_items)) : ?>
@@ -54,11 +54,11 @@
 		$rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
 		$row = $counter / $this->columns;
 
-		if ($rowcount == 1) : ?>
+		if ($rowcount === 1) : ?>
 
 		<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-' . $row; ?> row-fluid">
 		<?php endif; ?>
-			<div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round((12 / $this->columns));?>"
+			<div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round(12 / $this->columns);?>"
 				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 			<?php
 					$this->item = &$item;
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index e01bb49335e65..ebaad38fb7acc 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -60,7 +60,7 @@ public function display($tpl = null)
 			$row->fulltext = $db->loadResult();
 
 			$description = ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
-			$author      = $row->created_by_alias ? $row->created_by_alias : $row->author;
+			$author      = $row->created_by_alias ?: $row->author;
 
 			// Load individual item creator class
 			$item           = new JFeedItem;
@@ -83,7 +83,7 @@ public function display($tpl = null)
 
 			$item->author = $author;
 
-			if ($feedEmail == 'site')
+			if ($feedEmail === 'site')
 			{
 				$item->authorEmail = $siteEmail;
 			}
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index b03e6d627237e..c2838e0cbd27e 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -75,11 +75,11 @@ public function display($tpl = null)
 		foreach ($items as &$item)
 		{
 			$item->slug        = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$item->catslug     = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 08b4bbfdef11f..43196e60f058c 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -82,7 +82,7 @@
 				<div class="tab-pane active" id="editor">
 					<?php echo $this->form->renderField('title'); ?>
 
-					<?php if (is_null($this->item->id)) : ?>
+					<?php if ($this->item->id === null) : ?>
 						<?php echo $this->form->renderField('alias'); ?>
 					<?php endif; ?>
 
@@ -142,7 +142,7 @@
 						<?php echo $this->form->renderField('publish_down'); ?>
 					<?php endif; ?>
 					<?php echo $this->form->renderField('access'); ?>
-					<?php if (is_null($this->item->id)):?>
+					<?php if ($this->item->id === null):?>
 						<div class="control-group">
 							<div class="control-label">
 							</div>
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index ee55e577a3223..49e1053fb1f81 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -44,7 +44,7 @@ public function display($tpl = null)
 
 		if (empty($this->item->id))
 		{
-			$authorised = $user->authorise('core.create', 'com_content') || (count($user->getAuthorisedCategories('com_content', 'core.create')));
+			$authorised = $user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create'));
 		}
 		else
 		{
@@ -104,7 +104,7 @@ public function display($tpl = null)
 		}
 
 		// Propose current language as default when creating new article
-		if (JLanguageMultilang::isEnabled() && empty($this->item->id))
+		if (empty($this->item->id) && JLanguageMultilang::isEnabled())
 		{
 			$lang = JFactory::getLanguage()->getTag();
 			$this->form->setFieldAttribute('language', 'default', $lang);

From 5c98de1a9da52146868b3a17f1f1184d4af6d40e Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 00:04:51 +0300
Subject: [PATCH 2/7] Ch-Ch-Ch-Changes!

Made some changes as pointed out by @andrepereiradasilva
---
 components/com_content/helpers/query.php               |  2 +-
 components/com_content/models/category.php             |  2 +-
 components/com_content/models/form.php                 | 10 +++++-----
 .../views/category/tmpl/default_articles.php           |  2 +-
 components/com_content/views/category/view.html.php    |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php
index 4b4d25247eaeb..ccb20734694e9 100644
--- a/components/com_content/helpers/query.php
+++ b/components/com_content/helpers/query.php
@@ -180,7 +180,7 @@ public static function buildVotingQuery($params = null)
 			$join = '';
 		}
 
-		return array ('select' => $select, 'join' => $join);
+		return array('select' => $select, 'join' => $join);
 	}
 
 	/**
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index a2035f7d10160..532c172b1d079 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -460,7 +460,7 @@ public function &getChildren()
 			$orderByPri = $params->get('orderby_pri');
 			if ($orderByPri === 'alpha' || $orderByPri === 'ralpha')
 			{
-				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') === 'alpha') ? 1 : (-1));
+				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($orderByPri === 'alpha') ? 1 : (-1));
 			}
 		}
 
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index 3833b225e8a34..7e38ab2047131 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -182,12 +182,12 @@ public function save($data)
 		if (JLanguageAssociations::isEnabled() && !empty($data['id'])
 			&& $associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
 		{
-				foreach ($associations as $tag => $associated)
-				{
-					$associations[$tag] = (int) $associated->id;
-				}
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
 
-				$data['associations'] = $associations;
+			$data['associations'] = $associations;
 		}
 
 		return parent::save($data);
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index 3fdc27954199a..6cd4614ecda3c 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -177,7 +177,7 @@
 				<td <?php echo $headerAuthor; ?> class="list-author">
 					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 						<?php $author = $article->author ?>
-						<?php $author = ($article->created_by_alias ?: $author);?>
+						<?php $author = $article->created_by_alias ?: $author; ?>
 						<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 						<?php else: ?>
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 1e56c16a6e7b4..01a5c50ea3db3 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -143,7 +143,7 @@ public function display($tpl = null)
 
 		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
 		// This makes it much easier for the designer to just interrogate the arrays.
-		if (($params->get('layout_type') === 'blog') || ($this->getLayout() === 'blog'))
+		if ($params->get('layout_type') === 'blog' || $this->getLayout() === 'blog')
 		{
 			foreach ($this->items as $i => $item)
 			{

From 13f5fee517d8d91c5908d98119db3fd479d9bdef Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 00:28:06 +0300
Subject: [PATCH 3/7] A bit more...

---
 .../views/category/tmpl/default_articles.php   |  3 +--
 .../views/category/tmpl/default_children.php   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index 6cd4614ecda3c..889274696ac89 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -176,8 +176,7 @@
 			<?php if ($this->params->get('list_show_author', 1)) : ?>
 				<td <?php echo $headerAuthor; ?> class="list-author">
 					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
-						<?php $author = $article->author ?>
-						<?php $author = $article->created_by_alias ?: $author; ?>
+						<?php $author = $article->created_by_alias ?: $article->author; ?>
 						<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 						<?php else: ?>
diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php
index f8ffba5a3b221..34799e7b8f5c5 100644
--- a/components/com_content/views/category/tmpl/default_children.php
+++ b/components/com_content/views/category/tmpl/default_children.php
@@ -23,20 +23,24 @@
 				$class = ' class="last"';
 			endif;
 		?>
-
+			<?php
+			$childNumItems = $child->getNumItems(true);
+			$childChildren = $child->getChildren();
+			$childChildrenCount = count($childChildren);
+			?>
 		<div<?php echo $class; ?>>
 			<?php $class = ''; ?>
 			<?php if ($lang->isRtl()) : ?>
 			<h3 class="page-header item-title">
 				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
 					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS_TIP'); ?>">
-						<?php echo $child->getNumItems(true); ?>
+						<?php echo $childNumItems; ?>
 					</span>
 				<?php endif; ?>
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
+				<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -45,11 +49,11 @@
 				<?php echo $this->escape($child->title); ?></a>
 				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
 					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS_TIP'); ?>">
-						<?php echo $child->getNumItems(true); ?>
+						<?php echo $childNumItems; ?>
 					</span>
 				<?php endif; ?>
 
-				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
+				<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			<?php endif;?>
@@ -62,10 +66,10 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) :?>
+			<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) :?>
 			<div class="collapse fade" id="category-<?php echo $child->id;?>">
 				<?php
-				$this->children[$child->id] = $child->getChildren();
+				$this->children[$child->id] = $childChildren;
 				$this->category = $child;
 				$this->maxLevel--;
 				echo $this->loadTemplate('children');

From c0b68fcdf7735dbd4d86aaf24d87dfab9b53db8a Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 01:04:58 +0300
Subject: [PATCH 4/7] Revert

---
 .../views/category/tmpl/default_children.php   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php
index 34799e7b8f5c5..f8ffba5a3b221 100644
--- a/components/com_content/views/category/tmpl/default_children.php
+++ b/components/com_content/views/category/tmpl/default_children.php
@@ -23,24 +23,20 @@
 				$class = ' class="last"';
 			endif;
 		?>
-			<?php
-			$childNumItems = $child->getNumItems(true);
-			$childChildren = $child->getChildren();
-			$childChildrenCount = count($childChildren);
-			?>
+
 		<div<?php echo $class; ?>>
 			<?php $class = ''; ?>
 			<?php if ($lang->isRtl()) : ?>
 			<h3 class="page-header item-title">
 				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
 					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS_TIP'); ?>">
-						<?php echo $childNumItems; ?>
+						<?php echo $child->getNumItems(true); ?>
 					</span>
 				<?php endif; ?>
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -49,11 +45,11 @@
 				<?php echo $this->escape($child->title); ?></a>
 				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
 					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS_TIP'); ?>">
-						<?php echo $childNumItems; ?>
+						<?php echo $child->getNumItems(true); ?>
 					</span>
 				<?php endif; ?>
 
-				<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			<?php endif;?>
@@ -66,10 +62,10 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if ($this->maxLevel > 1 && $childChildrenCount > 0) :?>
+			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) :?>
 			<div class="collapse fade" id="category-<?php echo $child->id;?>">
 				<?php
-				$this->children[$child->id] = $childChildren;
+				$this->children[$child->id] = $child->getChildren();
 				$this->category = $child;
 				$this->maxLevel--;
 				echo $this->loadTemplate('children');

From acd28f71ba1df940f8530a985f46072f691464cb Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 15:51:04 +0300
Subject: [PATCH 5/7] Removed empty function, as there is a fallback. Change
 made according to comment from @wilsonge

---
 components/com_content/controllers/article.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
index a86c062355348..5aac8ebc908e4 100644
--- a/components/com_content/controllers/article.php
+++ b/components/com_content/controllers/article.php
@@ -274,20 +274,6 @@ protected function getReturnPage()
 		}
 	}
 
-	/**
-	 * Function that allows child controller access to model data after the data has been saved.
-	 *
-	 * @param   JModelLegacy  $model      The data model object.
-	 * @param   array         $validData  The validated data.
-	 *
-	 * @return  void
-	 *
-	 * @since   1.6
-	 */
-	protected function postSaveHook(JModelLegacy $model, $validData = array())
-	{
-	}
-
 	/**
 	 * Method to save a record.
 	 *

From 2d966e2f1e92415a1a8b7e3e82796b6e49d45ce8 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Dec 2016 20:26:16 +0200
Subject: [PATCH 6/7] Included @andrepereiradasilva's suggestions

---
 components/com_content/models/category.php                   | 1 +
 components/com_content/views/category/tmpl/blog_children.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index d430b0cbc1268..f8e6166526395 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -459,6 +459,7 @@ public function &getChildren()
 			$params = $this->getState()->get('params');
 
 			$orderByPri = $params->get('orderby_pri');
+
 			if ($orderByPri === 'alpha' || $orderByPri === 'ralpha')
 			{
 				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($orderByPri === 'alpha') ? 1 : (-1));
diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php
index a54664d406c6a..b80b31f71fb27 100644
--- a/components/com_content/views/category/tmpl/blog_children.php
+++ b/components/com_content/views/category/tmpl/blog_children.php
@@ -37,7 +37,7 @@
 
 				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
-				<?php endif;?>
+				<?php endif; ?>
 			</h3>
 			<?php else : ?>
 			<h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
@@ -51,7 +51,7 @@
 
 				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
-				<?php endif;?>
+				<?php endif; ?>
 			</h3>
 			<?php endif; ?>
 

From 0e940755874ffdeb7a760fe6a43ea0b35de7cd90 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Dec 2016 21:44:34 +0200
Subject: [PATCH 7/7] Inserting whitespace before php closing tag

---
 components/com_content/views/category/tmpl/blog_children.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php
index b80b31f71fb27..058bcd3790419 100644
--- a/components/com_content/views/category/tmpl/blog_children.php
+++ b/components/com_content/views/category/tmpl/blog_children.php
@@ -36,7 +36,7 @@
 				<?php echo $this->escape($child->title); ?></a>
 
 				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
-					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
+					<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif; ?>
 			</h3>
 			<?php else : ?>
@@ -50,7 +50,7 @@
 				<?php endif; ?>
 
 				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
-					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
+					<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif; ?>
 			</h3>
 			<?php endif; ?>