diff --git a/admin/blog.php b/admin/blog.php
index 0685418..6022c52 100644
--- a/admin/blog.php
+++ b/admin/blog.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/controller.php b/admin/controller.php
index 535728d..f16209e 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 5d623a7..f2600f9 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/controllers/article.php b/admin/controllers/article.php
index 91eef54..67e717c 100644
--- a/admin/controllers/article.php
+++ b/admin/controllers/article.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/controllers/articles.php b/admin/controllers/articles.php
index 66f501f..a317dfb 100644
--- a/admin/controllers/articles.php
+++ b/admin/controllers/articles.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/controllers/featured.php b/admin/controllers/featured.php
index 150d801..31cba06 100644
--- a/admin/controllers/featured.php
+++ b/admin/controllers/featured.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/helpers/associations.php b/admin/helpers/associations.php
index a85f092..16c3f79 100644
--- a/admin/helpers/associations.php
+++ b/admin/helpers/associations.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/helpers/blog.php b/admin/helpers/blog.php
index 0445e8d..fcc33d6 100644
--- a/admin/helpers/blog.php
+++ b/admin/helpers/blog.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/helpers/html/blogadministrator.php b/admin/helpers/html/blogadministrator.php
index 8b0322a..e74a89c 100644
--- a/admin/helpers/html/blogadministrator.php
+++ b/admin/helpers/html/blogadministrator.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/language/en-GB.com_blog.ini b/admin/language/en-GB.com_blog.ini
index 774d1cb..e2e5406 100644
--- a/admin/language/en-GB.com_blog.ini
+++ b/admin/language/en-GB.com_blog.ini
@@ -1,5 +1,5 @@
; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt
; Note : All ini files need to be saved as UTF-8
@@ -34,6 +34,7 @@ COM_BLOG_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_DESC="Select the page the user will
COM_BLOG_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL="Cancel Redirect"
COM_BLOG_CREATE_ARTICLE_CATEGORY_LABEL="Default Category"
COM_BLOG_CREATE_ARTICLE_CATEGORY_DESC="If set to 'Yes', this page will only let you create articles in the category selected below."
+COM_BLOG_CREATE_ARTICLE_CATEGORY_LABEL="Specific Category"
COM_BLOG_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission/Cancel Redirect', to redirect to when user Cancels article submission.
If set to 'No', when user Cancels article submission, the user is redirected to the above 'Submission/Cancel Redirect' page."
COM_BLOG_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL="Custom Redirect on Cancel"
COM_BLOG_CREATE_ARTICLE_ERROR="When default category is enabled, a category should be selected."
diff --git a/admin/language/en-GB.com_blog.sys.ini b/admin/language/en-GB.com_blog.sys.ini
index cb72013..e2f023c 100644
--- a/admin/language/en-GB.com_blog.sys.ini
+++ b/admin/language/en-GB.com_blog.sys.ini
@@ -1,5 +1,5 @@
; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt
; Note : All ini files need to be saved as UTF-8
diff --git a/admin/layouts/joomla/edit/global.php b/admin/layouts/joomla/edit/global.php
index 276195e..5b15c7f 100644
--- a/admin/layouts/joomla/edit/global.php
+++ b/admin/layouts/joomla/edit/global.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage Layout
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/models/article.php b/admin/models/article.php
index 3aada83..482ccd1 100644
--- a/admin/models/article.php
+++ b/admin/models/article.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/models/articles.php b/admin/models/articles.php
index 659d16b..5298a90 100644
--- a/admin/models/articles.php
+++ b/admin/models/articles.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -219,11 +219,8 @@ protected function getListQuery()
->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
// Join on voting table
- $assogroup = 'a.id, l.title, l.image, uc.name, ag.title, c.title, ua.name, c.created_user_id, c.level, parent.id';
-
if (JPluginHelper::isEnabled('content', 'vote'))
{
- $assogroup .= ', v.rating_sum, v.rating_count';
$query->select('COALESCE(NULLIF(ROUND(v.rating_sum / v.rating_count, 0), 0), 0) AS rating,
COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
->join('LEFT', '#__blog_rating AS v ON a.id = v.content_id');
@@ -232,10 +229,18 @@ protected function getListQuery()
// Join over the associations.
if (JLanguageAssociations::isEnabled())
{
- $query->select('CASE WHEN COUNT(asso2.id)>1 THEN 1 ELSE 0 END as association')
- ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_blog.item'))
- ->join('LEFT', '#__associations AS asso2 ON ' . $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key'))
- ->group($assogroup);
+ $subQuery = $db->getQuery(true)
+ ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
+ ->from($db->quoteName('#__associations', 'asso1'))
+ ->join('INNER', $db->quoteName('#__associations', 'asso2') . ' ON ' . $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
+ ->where(
+ array(
+ $db->quoteName('asso1.id') . ' = ' . $db->quoteName('a.id'),
+ $db->quoteName('asso1.context') . ' = ' . $db->quote('com_content.item'),
+ )
+ );
+
+ $query->select('(' . $subQuery . ') AS ' . $db->quoteName('association'));
}
// Filter by access level.
diff --git a/admin/models/feature.php b/admin/models/feature.php
index 3db4825..d784fad 100644
--- a/admin/models/feature.php
+++ b/admin/models/feature.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/models/featured.php b/admin/models/featured.php
index aa4fa06..8a03a1a 100644
--- a/admin/models/featured.php
+++ b/admin/models/featured.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/models/fields/modal/article.php b/admin/models/fields/modal/article.php
index 17f6df6..b39ade9 100644
--- a/admin/models/fields/modal/article.php
+++ b/admin/models/fields/modal/article.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/models/fields/voteradio.php b/admin/models/fields/voteradio.php
index f0f60d9..93e817b 100644
--- a/admin/models/fields/voteradio.php
+++ b/admin/models/fields/voteradio.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/tables/blog.php b/admin/tables/blog.php
index cc533cf..7f7c719 100644
--- a/admin/tables/blog.php
+++ b/admin/tables/blog.php
@@ -2,7 +2,7 @@
/**
* Joomla! Blog Management System
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/tables/featured.php b/admin/tables/featured.php
index de25521..0e908f3 100644
--- a/admin/tables/featured.php
+++ b/admin/tables/featured.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/edit.php b/admin/views/article/tmpl/edit.php
index 3ccb378..c177202 100644
--- a/admin/views/article/tmpl/edit.php
+++ b/admin/views/article/tmpl/edit.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/edit_associations.php b/admin/views/article/tmpl/edit_associations.php
index 760dcce..17746a1 100644
--- a/admin/views/article/tmpl/edit_associations.php
+++ b/admin/views/article/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/edit_metadata.php b/admin/views/article/tmpl/edit_metadata.php
index 210f69e..da5aab4 100644
--- a/admin/views/article/tmpl/edit_metadata.php
+++ b/admin/views/article/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/modal.php b/admin/views/article/tmpl/modal.php
index 3777ebf..c6470f1 100644
--- a/admin/views/article/tmpl/modal.php
+++ b/admin/views/article/tmpl/modal.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/modal_associations.php b/admin/views/article/tmpl/modal_associations.php
index 760dcce..17746a1 100644
--- a/admin/views/article/tmpl/modal_associations.php
+++ b/admin/views/article/tmpl/modal_associations.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/modal_metadata.php b/admin/views/article/tmpl/modal_metadata.php
index 210f69e..da5aab4 100644
--- a/admin/views/article/tmpl/modal_metadata.php
+++ b/admin/views/article/tmpl/modal_metadata.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/tmpl/pagebreak.php b/admin/views/article/tmpl/pagebreak.php
index 33e1c59..9ca143d 100644
--- a/admin/views/article/tmpl/pagebreak.php
+++ b/admin/views/article/tmpl/pagebreak.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/article/view.html.php b/admin/views/article/view.html.php
index 10308f5..1e6180f 100644
--- a/admin/views/article/view.html.php
+++ b/admin/views/article/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/articles/tmpl/default.php b/admin/views/articles/tmpl/default.php
index f6c547b..dbddf4c 100644
--- a/admin/views/articles/tmpl/default.php
+++ b/admin/views/articles/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/articles/tmpl/default_batch_body.php b/admin/views/articles/tmpl/default_batch_body.php
index 7f6cec2..bd0b916 100644
--- a/admin/views/articles/tmpl/default_batch_body.php
+++ b/admin/views/articles/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
diff --git a/admin/views/articles/tmpl/default_batch_footer.php b/admin/views/articles/tmpl/default_batch_footer.php
index f818ef3..7afaa07 100644
--- a/admin/views/articles/tmpl/default_batch_footer.php
+++ b/admin/views/articles/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
diff --git a/admin/views/articles/tmpl/modal.php b/admin/views/articles/tmpl/modal.php
index 0260941..6bb92af 100644
--- a/admin/views/articles/tmpl/modal.php
+++ b/admin/views/articles/tmpl/modal.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/articles/view.html.php b/admin/views/articles/view.html.php
index 19fb0e5..7ec9a62 100644
--- a/admin/views/articles/view.html.php
+++ b/admin/views/articles/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/featured/tmpl/default.php b/admin/views/featured/tmpl/default.php
index 12d742a..ade5842 100644
--- a/admin/views/featured/tmpl/default.php
+++ b/admin/views/featured/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/admin/views/featured/view.html.php b/admin/views/featured/view.html.php
index 2fd1672..27cbfd6 100644
--- a/admin/views/featured/view.html.php
+++ b/admin/views/featured/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/blog.xml b/blog.xml
index b1699fa..31bd1b5 100644
--- a/blog.xml
+++ b/blog.xml
@@ -7,7 +7,7 @@
GNU General Public License version 2 or later; see LICENSE.txt
admin@joomla.org
www.joomla.org
- 3.0.14
+ 3.0.15
com_blog_xml_description
install.com_blog.php
diff --git a/site/blog.php b/site/blog.php
index 1f4274a..0851b05 100644
--- a/site/blog.php
+++ b/site/blog.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/controller.php b/site/controller.php
index 1f8660d..279b1f0 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/controllers/article.php b/site/controllers/article.php
index cc9f23d..e60cf37 100644
--- a/site/controllers/article.php
+++ b/site/controllers/article.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/association.php b/site/helpers/association.php
index 5ef4a99..ab4b58d 100644
--- a/site/helpers/association.php
+++ b/site/helpers/association.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/category.php b/site/helpers/category.php
index 41784f1..9db652b 100644
--- a/site/helpers/category.php
+++ b/site/helpers/category.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/icon.php b/site/helpers/icon.php
index 8f73eba..d28f747 100644
--- a/site/helpers/icon.php
+++ b/site/helpers/icon.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/legacyrouter.php b/site/helpers/legacyrouter.php
index 95404e1..cf7b219 100644
--- a/site/helpers/legacyrouter.php
+++ b/site/helpers/legacyrouter.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/query.php b/site/helpers/query.php
index 152b3bc..d857f0d 100644
--- a/site/helpers/query.php
+++ b/site/helpers/query.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/helpers/route.php b/site/helpers/route.php
index 0f699b0..633ce5a 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/language/en-GB.com_blog.ini b/site/language/en-GB.com_blog.ini
index 9b4537d..782859e 100644
--- a/site/language/en-GB.com_blog.ini
+++ b/site/language/en-GB.com_blog.ini
@@ -1,5 +1,5 @@
; Joomla! Project
-; Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2020 Open Source Matters. All rights reserved.
; License GNU General Public License version 2 or later; see LICENSE.txt
; Note : All ini files need to be saved as UTF-8
diff --git a/site/models/archive.php b/site/models/archive.php
index c048eb5..3399eb7 100644
--- a/site/models/archive.php
+++ b/site/models/archive.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/article.php b/site/models/article.php
index 202a5f0..2b176f8 100644
--- a/site/models/article.php
+++ b/site/models/article.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/articles.php b/site/models/articles.php
index 62280bb..60828b4 100644
--- a/site/models/articles.php
+++ b/site/models/articles.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/categories.php b/site/models/categories.php
index ec95b25..30c13f0 100644
--- a/site/models/categories.php
+++ b/site/models/categories.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/category.php b/site/models/category.php
index 4d1dd3d..ab05fb1 100644
--- a/site/models/category.php
+++ b/site/models/category.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/featured.php b/site/models/featured.php
index b34b96b..4329560 100644
--- a/site/models/featured.php
+++ b/site/models/featured.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/models/form.php b/site/models/form.php
index 0c62dfe..fbe408c 100644
--- a/site/models/form.php
+++ b/site/models/form.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -206,9 +206,9 @@ protected function preprocessForm(JForm $form, $data, $group = 'blog')
{
$params = $this->getState()->get('params');
- if ($params && $params->get('enable_category') == 1)
+ if ($params && $params->get('enable_category') == 1 && $params->get('catid'))
{
- $form->setFieldAttribute('catid', 'default', $params->get('catid', 1));
+ $form->setFieldAttribute('catid', 'default', $params->get('catid'));
$form->setFieldAttribute('catid', 'readonly', 'true');
}
diff --git a/site/router.php b/site/router.php
index 85d86ce..8d7816d 100644
--- a/site/router.php
+++ b/site/router.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/archive/tmpl/default.php b/site/views/archive/tmpl/default.php
index 878832e..6e2c753 100644
--- a/site/views/archive/tmpl/default.php
+++ b/site/views/archive/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/archive/tmpl/default_items.php b/site/views/archive/tmpl/default_items.php
index ab6da47..0d4dd4c 100644
--- a/site/views/archive/tmpl/default_items.php
+++ b/site/views/archive/tmpl/default_items.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/archive/view.html.php b/site/views/archive/view.html.php
index f56b3af..d90ff3f 100644
--- a/site/views/archive/view.html.php
+++ b/site/views/archive/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/article/tmpl/default.php b/site/views/article/tmpl/default.php
index ea94813..19a33fb 100644
--- a/site/views/article/tmpl/default.php
+++ b/site/views/article/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/article/tmpl/default_links.php b/site/views/article/tmpl/default_links.php
index 4eaa66a..3fac743 100644
--- a/site/views/article/tmpl/default_links.php
+++ b/site/views/article/tmpl/default_links.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/article/view.html.php b/site/views/article/view.html.php
index 2946457..2001fc3 100644
--- a/site/views/article/view.html.php
+++ b/site/views/article/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php
index 7912cb7..765b36e 100644
--- a/site/views/categories/tmpl/default.php
+++ b/site/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/categories/tmpl/default_items.php b/site/views/categories/tmpl/default_items.php
index 1554e74..91543f9 100644
--- a/site/views/categories/tmpl/default_items.php
+++ b/site/views/categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/categories/view.html.php b/site/views/categories/view.html.php
index 389d2cd..d2255a1 100644
--- a/site/views/categories/view.html.php
+++ b/site/views/categories/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/blog.php b/site/views/category/tmpl/blog.php
index 7d2ac15..303affd 100644
--- a/site/views/category/tmpl/blog.php
+++ b/site/views/category/tmpl/blog.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/blog_children.php b/site/views/category/tmpl/blog_children.php
index fc13ddd..1cc1020 100644
--- a/site/views/category/tmpl/blog_children.php
+++ b/site/views/category/tmpl/blog_children.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/blog_item.php b/site/views/category/tmpl/blog_item.php
index 72295d6..06cdf20 100644
--- a/site/views/category/tmpl/blog_item.php
+++ b/site/views/category/tmpl/blog_item.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/blog_links.php b/site/views/category/tmpl/blog_links.php
index 540018a..be2446b 100644
--- a/site/views/category/tmpl/blog_links.php
+++ b/site/views/category/tmpl/blog_links.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php
index 62c092f..3f2260e 100644
--- a/site/views/category/tmpl/default.php
+++ b/site/views/category/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/default.xml b/site/views/category/tmpl/default.xml
index aaf79e1..4a80161 100644
--- a/site/views/category/tmpl/default.xml
+++ b/site/views/category/tmpl/default.xml
@@ -26,6 +26,15 @@
edit="true"
clear="true"
/>
+
+
diff --git a/site/views/category/tmpl/default_articles.php b/site/views/category/tmpl/default_articles.php
index 43e2298..59c5797 100644
--- a/site/views/category/tmpl/default_articles.php
+++ b/site/views/category/tmpl/default_articles.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/tmpl/default_children.php b/site/views/category/tmpl/default_children.php
index 6fd3a41..c1c2366 100644
--- a/site/views/category/tmpl/default_children.php
+++ b/site/views/category/tmpl/default_children.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/view.feed.php b/site/views/category/view.feed.php
index 81e5467..aa3ac4f 100644
--- a/site/views/category/view.feed.php
+++ b/site/views/category/view.feed.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php
index 48a7e41..87c6fff 100644
--- a/site/views/category/view.html.php
+++ b/site/views/category/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/featured/tmpl/default.php b/site/views/featured/tmpl/default.php
index dd8719c..7fee0d2 100644
--- a/site/views/featured/tmpl/default.php
+++ b/site/views/featured/tmpl/default.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/featured/tmpl/default_item.php b/site/views/featured/tmpl/default_item.php
index 27bd147..6a588fe 100644
--- a/site/views/featured/tmpl/default_item.php
+++ b/site/views/featured/tmpl/default_item.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/featured/tmpl/default_links.php b/site/views/featured/tmpl/default_links.php
index 0d33096..cb998cf 100644
--- a/site/views/featured/tmpl/default_links.php
+++ b/site/views/featured/tmpl/default_links.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/featured/view.feed.php b/site/views/featured/view.feed.php
index e621a69..cff3203 100644
--- a/site/views/featured/view.feed.php
+++ b/site/views/featured/view.feed.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/featured/view.html.php b/site/views/featured/view.html.php
index 143bb79..169c14a 100644
--- a/site/views/featured/view.html.php
+++ b/site/views/featured/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/form/tmpl/edit.php b/site/views/form/tmpl/edit.php
index 15f37fe..d489464 100644
--- a/site/views/form/tmpl/edit.php
+++ b/site/views/form/tmpl/edit.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/site/views/form/view.html.php b/site/views/form/view.html.php
index 33610ce..801ccef 100644
--- a/site/views/form/view.html.php
+++ b/site/views/form/view.html.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage com_blog
*
- * @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
@@ -52,7 +52,16 @@ public function display($tpl = null)
if (empty($this->item->id))
{
- $authorised = $user->authorise('core.create', 'com_blog') || count($user->getAuthorisedCategories('com_blog', 'core.create'));
+ $catid = $this->state->params->get('catid');
+
+ if ($this->state->params->get('enable_category') == 1 && $catid)
+ {
+ $authorised = $user->authorise('core.create', 'com_blog.category.' . $catid);
+ }
+ else
+ {
+ $authorised = $user->authorise('core.create', 'com_blog') || count($user->getAuthorisedCategories('com_blog', 'core.create'));
+ }
}
else
{