Merge branch 'master' into fix_category_view

src/components/com_weblinks/models/categories.php

@@ -92,7 +92,7 @@ class WeblinksModelCategories extends JModelList
 	 */
 	public function getItems()
 	{
-		if (is_null($this->_items) || !count($this->_items))
+		if ($this->_items === null)
 		{
 			$app = JFactory::getApplication();
 			$menu = $app->getMenu();

src/modules/mod_weblinks/helper.php

@@ -110,6 +110,6 @@ class ModWeblinksHelper
 			return $items;
 		}
 
-		return;
+		return array();
 	}
 }