SEO: Description is duplicate in user list pagination #6434

Kunena · Jun 5, 2019 · 7947b78 · 7947b78
1 parent 42e869a
commit 7947b78
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/src/components/com_kunena/controller/user/list/display.php b/src/components/com_kunena/controller/user/list/display.php
@@ -21,48 +21,43 @@
  */
 class ComponentKunenaControllerUserListDisplay extends KunenaControllerDisplay
 {
-	/**
-	 * @var string
-	 * @since Kunena
-	 */
-	protected $name = 'User/List';
-
 	/**
 	 * @var
 	 * @since Kunena
 	 */
 	public $state;
-
 	/**
 	 * @var
 	 * @since Kunena
 	 */
 	public $me;
-
 	/**
 	 * @var
 	 * @since Kunena
 	 */
 	public $total;
-
 	/**
 	 * @var
 	 * @since Kunena
 	 */
 	public $users;
-
 	/**
 	 * @var
 	 * @since Kunena
 	 */
 	public $pagination;
+	/**
+	 * @var string
+	 * @since Kunena
+	 */
+	protected $name = 'User/List';
 
 	/**
 	 * Load user list.
 	 *
-	 * @throws Exception
-	 * @throws null
 	 * @since Kunena
+	 * @throws null
+	 * @throws Exception
 	 */
 	protected function before()
 	{
@@ -134,8 +129,8 @@ protected function before()
 	 * Prepare document.
 	 *
 	 * @return void
-	 * @throws Exception
 	 * @since Kunena
+	 * @throws Exception
 	 */
 	protected function prepareDocument()
 	{
@@ -166,7 +161,7 @@ protected function prepareDocument()
 
 			if (!empty($params_keywords))
 			{
-				$keywords = $params->get('menu-meta_keywords');
+				$keywords = $params->get('menu-meta_keywords') . $pagesText;
 				$this->setKeywords($keywords);
 			}
 			else
@@ -177,7 +172,7 @@ protected function prepareDocument()
 
 			if (!empty($params_description))
 			{
-				$description = $params->get('menu-meta_description');
+				$description = $params->get('menu-meta_description') . $pagesText;
 				$this->setDescription($description);
 			}
 			else

diff --git a/src/components/com_kunena/layout/category/index.php b/src/components/com_kunena/layout/category/index.php
@@ -23,7 +23,7 @@ class KunenaLayoutCategoryIndex extends KunenaLayout
 	/**
 	 * Method to return a KunenaPagination object
 	 *
-	 * @param   int $maxpages Maximum that are allowed for pagination
+	 * @param   int  $maxpages  Maximum that are allowed for pagination
 	 *
 	 * @return KunenaPagination
 	 * @since Kunena
@@ -39,11 +39,11 @@ public function getPaginationObject($maxpages)
 	/**
 	 * Method to retrieve category icon
 	 *
-	 * @param   string $category The KunenaCategory object
+	 * @param   string  $category  The KunenaCategory object
 	 *
 	 * @return string
-	 * @throws Exception
 	 * @since Kunena
+	 * @throws Exception
 	 */
 	public function getCategoryIcon($category)
 	{
@@ -77,11 +77,11 @@ public function getCategoryIcon($category)
 	/**
 	 * Method to retrieve small category icon
 	 *
-	 * @param   string $subcategory The KunenaCategory object
+	 * @param   string  $subcategory  The KunenaCategory object
 	 *
 	 * @return string
-	 * @throws Exception
 	 * @since Kunena
+	 * @throws Exception
 	 */
 	public function getSmallCategoryIcon($subcategory)
 	{
@@ -115,12 +115,12 @@ public function getSmallCategoryIcon($subcategory)
 	/**
 	 * Method to retrieve the URL of mark read button
 	 *
-	 * @param   int $category_id The category Id
-	 * @param   int $numTopics   The number of topics
+	 * @param   int  $category_id  The category Id
+	 * @param   int  $numTopics    The number of topics
 	 *
 	 * @return boolean|null
-	 * @throws Exception
 	 * @since Kunena
+	 * @throws Exception
 	 * @throws null
 	 */
 	public function getMarkReadButtonURL($category_id, $numTopics)
@@ -141,12 +141,12 @@ public function getMarkReadButtonURL($category_id, $numTopics)
 	/**
 	 * Method to retrieve the URL of category RSS feed
 	 *
-	 * @param   int         $catid The Id of category
-	 * @param   bool|string $xhtml Replace & by & for XML compliance.
+	 * @param   int          $catid  The Id of category
+	 * @param   bool|string  $xhtml  Replace & by & for XML compliance.
 	 *
 	 * @return boolean|null
-	 * @throws Exception
 	 * @since Kunena
+	 * @throws Exception
 	 * @throws null
 	 */
 	public function getCategoryRSSURL($catid, $xhtml = true)

diff --git a/src/libraries/kunena/forum/category/category.php b/src/libraries/kunena/forum/category/category.php
@@ -173,7 +173,7 @@ class KunenaForumCategory extends KunenaDatabaseObject
 	 * @var integer
 	 * @since Kunena
 	 */
-	protected $_new = 0;
+	protected $_new = null;
 
 	/**
 	 * @var string