Version 5.0.6

applications/blog/Application.php

@@ -90,7 +90,8 @@ class Application extends SystemApplication
 		}
 
 		/* We have to use get() to ensure CDATA tags wrap the blog title properly */
-		$title	= $blog->member_id ? $blog->name : $member->language()->get( "blogs_blog_{$blog->id}" );
+
+		$title	= $member->language()->get( "blogs_blog_{$blog->id}" );
 
 		$document = Rss::newDocument( $blog->url(), $title, $blog->description );
 	

applications/blog/data/javascript.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="blog">
- <file javascript_app="blog" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.manageCategories.js" javascript_type="controller" javascript_version="5000049" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="blog" javascript_location="front" javascript_path="controllers/view" javascript_name="ips.view.manageCategories.js" javascript_type="controller" javascript_version="5000074" javascript_position="1000100"><![CDATA[/**
  * Invision Community
  * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
  *
@@ -277,7 +277,7 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="blog" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.view.js" javascript_type="template" javascript_version="5000049" javascript_position="1000050"><![CDATA[/* CLASS LIST TEMPLATES */
+ <file javascript_app="blog" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.view.js" javascript_type="template" javascript_version="5000074" javascript_position="1000050"><![CDATA[/* CLASS LIST TEMPLATES */
 ips.templates.set('blog.view.addButton', "\
 <li><button type=\"button\" class=\"ipsButton ipsButton--primary ipsHide\" data-action=\"addNew\">{{#lang}}manage_cats_new_row{{/lang}}</button></li>\
 ");
@@ -310,8 +310,7 @@ mustache
 Debug.js
 app.js</order>
  <order app="global" path="/dev/js//library//jquery">jquery.js
-jquery-migrate.js
-jquery.transform.js</order>
+jquery-migrate.js</order>
  <order app="global" path="/dev/js//library//linkify">linkify.min.js
 linkify-jquery.min.js</order>
 </javascript>

applications/blog/data/lang.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="blog" version="5000049">
+ <app key="blog" version="5000074">
   <word key="__app_blog" js="0">Blogs</word>
   <word key="frontnavigation_blogs" js="0">Blogs</word>
   <word key="__indefart_blog_entry_comment" js="0">a comment on a blog entry</word>

applications/blog/data/theme.xml

@@ -96,18 +96,25 @@
 		</i-data>
 	</div>
 </section>]]></template>
- <template template_group="browse" template_name="index" template_data="$table, $featured, $blogs=array(), $viewMode=NULL, $category=NULL" template_location="front" template_app="blog"><![CDATA[<header class="ipsPageHeader ipsPageHeader--blogs-index">
+ <template template_group="browse" template_name="index" template_data="$table, $featured, $blogs=array(), $viewMode=NULL, $category=NULL" template_location="front" template_app="blog"><![CDATA[<header class="ipsPageHeader ipsPageHeader--blogs-index {{if $category !== null}}ipsBox ipsPull{{endif}}">
 	<div class="ipsPageHeader__row">
 		<div data-ips-hook="header" class='ipsPageHeader__primary'>
-			<h1 data-ips-hook="title" class='ipsPageHeader__title'>{lang="blogs"}</h1>
+			<h1 data-ips-hook="title" class='ipsPageHeader__title'>{{if $category !== null}}{$category->_title}{{else}}{lang="blogs"}{{endif}}</h1>
 		</div>
-		{{if \count( $blogs ) || \IPS\blog\Blog::canCreate()}}
+		{{if $category === null and ( \count( $blogs ) || \IPS\blog\Blog::canCreate() )}}
 			<div data-ips-hook="buttons">
 				{template="indexButtons" group="browse" params="$blogs, $viewMode, FALSE, $category"}
 			</div>
 		{{endif}}
 	</div>
 </header>
+
+{{if $category !== null and ( \count( $blogs ) || \IPS\blog\Blog::canCreate() )}}
+    <div data-ips-hook="buttons" class='ipsBlockSpacer'>
+		{template="indexButtons" group="browse" params="$blogs, $viewMode, FALSE, $category"}
+	</div>
+{{endif}}
+
 {{if \count( $featured )}}
 	{template="featuredEntries" group="browse" params="$featured"}
 {{endif}}
@@ -169,18 +176,26 @@
 		{{endif}}
 	</ul>
 {{endif}}]]></template>
- <template template_group="browse" template_name="indexGrid" template_data="$entries, $featured, $blogs, $pagination, $viewMode, $category" template_location="front" template_app="blog"><![CDATA[<header class="ipsPageHeader ipsPageHeader--blogs-grid">
+ <template template_group="browse" template_name="indexGrid" template_data="$entries, $featured, $blogs, $pagination, $viewMode, $category" template_location="front" template_app="blog"><![CDATA[
+<header class="ipsPageHeader ipsPageHeader--blogs-grid {{if $category !== null}}ipsBox ipsPull{{endif}}">
 	<div class="ipsPageHeader__row">
 		<div data-ips-hook="header" class='ipsPageHeader__primary'>
-			<h1 data-ips-hook="title" class='ipsPageHeader__title'>{lang="blogs"}</h1>
+			<h1 data-ips-hook="title" class='ipsPageHeader__title'>{{if $category !== null}}{$category->_title}{{else}}{lang="blogs"}{{endif}}</h1>
 		</div>
-		{{if \count( $blogs ) || \IPS\blog\Blog::canCreate()}}
-			<div data-ips-hook="buttons">
-				{template="indexButtons" group="browse" params="$blogs, $viewMode, FALSE, $category"}
-			</div>
-		{{endif}}
+		{{if $category === null and ( \count( $blogs ) || \IPS\blog\Blog::canCreate() )}}
+            <div data-ips-hook="buttons">
+                {template="indexButtons" group="browse" params="$blogs, $viewMode, FALSE, $category"}
+            </div>
+        {{endif}}
 	</div>
 </header>
+
+{{if $category !== null and ( \count( $blogs ) || \IPS\blog\Blog::canCreate() )}}
+    <div data-ips-hook="buttons" class='ipsBlockSpacer'>
+        {template="indexButtons" group="browse" params="$blogs, $viewMode, FALSE, $category"}
+    </div>
+{{endif}}
+
 {{if \count( $featured )}}
 	{template="featuredEntries" group="browse" params="$featured"}
 {{endif}}
@@ -636,9 +651,7 @@
 </div>]]></template>
  <template template_group="submit" template_name="createBlog" template_data="$form" template_location="front" template_app="blog"><![CDATA[
 {template="pageHeader" group="global" app="core" params="\IPS\Member::loggedIn()->language()->get('create_blog')"}
-<div class='ipsBox'>
-	{$form|raw}
-</div>]]></template>
+{$form|raw}]]></template>
  <template template_group="submit" template_name="submit" template_data="$form, $blog=NULL" template_location="front" template_app="blog"><![CDATA[
 {{if $blog and $club = $blog->club()}}
 	{{if settings.clubs and settings.clubs_header == 'full'}}
@@ -658,7 +671,7 @@
 {{if $blog and $blog->club()}}
 	</div>
 {{endif}}]]></template>
- <template template_group="submit" template_name="submitFormTemplate" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class=''" template_location="front" template_app="blog"><![CDATA[<section class='ipsBox'>
+ <template template_group="submit" template_name="submitFormTemplate" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class=''" template_location="front" template_app="blog"><![CDATA[<section class='ipsBox ipsBox--submitBlog ipsPull'>
 	<form accept-charset='utf-8' class="ipsForm ipsForm--blog-submit {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} data-ipsForm data-ipsFormSubmit>
 		<input type="hidden" name="{$id}_submitted" value="1">
 		{{foreach $hiddenValues as $k => $v}}
@@ -685,6 +698,9 @@
 							{{foreach $contents as $inputName => $input}}
 								{$input|raw}
 							{{endforeach}}
+							<li class='ipsSubmitRow'>
+								<button type='submit' class='ipsButton ipsButton--primary'>{lang="entry_submit"}</button>
+							</li>
 						</ul>
 					</div>
 				{{endforeach}}
@@ -696,12 +712,11 @@
 						{$input|raw}
 					{{endforeach}}
 				{{endforeach}}
+				<li class='ipsSubmitRow'>
+					<button type='submit' class='ipsButton ipsButton--primary'>{lang="entry_submit"}</button>
+				</li>
 			</ul>
 		{{endif}}
-
-		<div class='ipsSubmitRow'>
-			<button type='submit' class='ipsButton ipsButton--primary'>{lang="entry_submit"}</button>
-		</div>
 	</form>
 </section>]]></template>
  <template template_group="view" template_name="blogHeader" template_data="$blog, $showCover=true" template_location="front" template_app="blog"><![CDATA[
@@ -789,7 +804,7 @@
 </div>]]></template>
  <template template_group="view" template_name="blogTable" template_data="$table, $headers, $rows, $quickSearch" template_location="front" template_app="blog"><![CDATA[<section class='ipsBox ipsPull' data-baseurl='{$table->baseUrl}' data-resort='{$table->resortKey}' data-controller='core.global.core.table{{if $table->canModerate()}},core.front.core.moderation{{endif}}' id='elTable_{$table->uniqueId}'>
 	{{if $table->title}}
-		<h2 class='ipsBox__header' hidden>{lang="$table->title"}</h2>
+		<h2 class='ipsInvisible'>{lang="$table->title"}</h2>
 	{{endif}}
 
 	{{if $table->canModerate() OR (isset( $table->sortOptions ) and !empty( $table->sortOptions )) OR !empty( $table->filters ) OR $table->pages > 1 OR $table->advancedSearch}}
@@ -1032,7 +1047,7 @@
 				</a>
 			</h2>
 			<p class='i-color_soft i-link-color_inherit'>
-				{{if $entry->category_id}}<span class="i-color_hard i-font-weight_600">{$entry->category()->name}</span>{{endif}} &middot; {lang="byline_name_date" htmlsprintf="$entry->author()->link()"}{datetime="$entry->date"}
+				{{if $entry->category_id}}<span class="i-color_hard i-font-weight_600">{$entry->category()->name}</span>{{endif}} &middot; {lang="byline_name_date" htmlsprintf="$entry->author()->link(), \IPS\DateTime::ts( $entry->date )"}
 			</p>
 		</div>
 	</header>
@@ -1082,7 +1097,7 @@
  <template template_group="view" template_name="comments" template_data="$entry" template_location="front" template_app="blog"><![CDATA[<section class='ipsBox ipsBox--comments ipsPull'>
 	<h2 class='ipsBox__header' data-role="comment_count">{lang="num_comments_uc" pluralize="$entry->num_comments"}</h2>
 	<div class='ipsBox__content'>
-		<div data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$entry->url()}' data-feedID='{$entry->feedId}' id='comments'>
+		<div data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$entry->url()}' data-feedID='{$entry->feedId}' id='comments' data-follow-area-id="entry-{$entry->id}">
 
 			{template="featuredComments" group="global" app="core" params="$entry->featuredComments(), $entry->url()->setQueryString( 'recommended', 'comments' )"}
 
@@ -1303,7 +1318,7 @@
 <div class='ipsBox ipsBox--padding ipsPull ipsResponsive_showPhone'>
 	<div class='ipsPageActions'>
 		{{if \count( $entry->shareLinks() )}}
-			{template="shareButton" app="core" group="sharelinks" params="$entry, 'verySmall', 'light'"}
+			{template="shareButton" app="core" group="sharelinks" params="$entry"}
 		{{endif}}
 		{{if \IPS\Application::appIsEnabled('cloud')}}
         	{template="spam" app="cloud" group="spam" params="$entry"}

applications/blog/data/versions.json

@@ -268,6 +268,13 @@
     "107785": "4.7.19",
     "107786": "4.7.19",
     "107787": "4.7.19",
+    "107795": "4.7.20 Beta 1",
+    "107796": "4.7.20 Beta 2",
+    "107797": "4.7.20 Beta 3",
+    "107798": "4.7.20 Beta 4",
+    "107799": "4.7.20 Beta 5",
+    "107800": "4.7.20",
+    "107801": "4.7.20",
     "500001": "5.0.0 Alpha 1",
     "500002": "5.0.0 Alpha 2",
     "5000003": "5.0.0 Alpha 3",
@@ -316,5 +323,30 @@
     "5000046": "5.0.0 Beta 14",
     "5000047": "5.0.0 Beta 14.1",
     "5000048": "5.0.0 Beta 14.2",
-    "5000049": "5.0.0"
+    "5000049": "5.0.0",
+    "5000050": "5.0.0",
+    "5000051": "5.0.0",
+    "5000052": "5.0.1",
+    "5000053": "5.0.1",
+    "5000054": "5.0.2",
+    "5000055": "5.0.2",
+    "5000056": "5.0.2",
+    "5000057": "5.0.3",
+    "5000058": "5.0.3",
+    "5000059": "5.0.3",
+    "5000060": "5.0.3",
+    "5000061": "5.0.4 Beta 1",
+    "5000062": "5.0.4 Beta 1",
+    "5000063": "5.0.4 Beta 1",
+    "5000064": "5.0.4 Beta 2",
+    "5000065": "5.0.4 Beta 3",
+    "5000066": "5.0.4",
+    "5000067": "5.0.5 Beta 1",
+    "5000068": "5.0.5 Beta 2",
+    "5000069": "5.0.5",
+    "5000070": "5.0.6 Beta 1",
+    "5000071": "5.0.6 Beta 2",
+    "5000072": "5.0.6 Beta 3",
+    "5000073": "5.0.6 Beta 4",
+    "5000074": "5.0.6"
 }

applications/blog/modules/front/blogs/browse.php

@@ -170,7 +170,7 @@ class browse extends Controller
 			Output::i()->defaultSearchOption = array( 'blog_entry', 'blog_entry_pl' );
 		}
 		Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js( 'front_browse.js', 'blog', 'front' ) );
-		Output::i()->title		= Member::loggedIn()->language()->addToStack('blogs');
+		Output::i()->title		= $category ? $category->_title : Member::loggedIn()->language()->addToStack( 'blogs' );
 		
 	}
 }

applications/blog/setup/upg_107795/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107795,
+    "name": "4.7.20 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107796/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107796,
+    "name": "4.7.20 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107797/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107797,
+    "name": "4.7.20 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107798/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107798,
+    "name": "4.7.20 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107799/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107799,
+    "name": "4.7.20 Beta 5",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107800/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107800,
+    "name": "4.7.20",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_107801/data.json

@@ -0,0 +1,23 @@
+{
+    "id": 107801,
+    "name": "4.7.20",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeSettings": false,
+        "javascript": false,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000050/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000050,
+    "name": "5.0.0",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000050/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000051/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000051,
+    "name": "5.0.0",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000051/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000052/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000052,
+    "name": "5.0.1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000052/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000053/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000053,
+    "name": "5.0.1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000053/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000054/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000054,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000054/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000055/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000055,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000055/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000056/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000056,
+    "name": "5.0.2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000056/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000057/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000057,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000057/theme.json

@@ -0,0 +1,21 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/browse\/index",
+            "front\/browse\/indexGrid",
+            "front\/submit\/createBlog"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000057/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000058/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000058,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000058/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000059/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000059,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000059/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000060/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000060,
+    "name": "5.0.3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000060/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000061/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000061,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000061/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/comments"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000061/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000062/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000062,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000062/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000063/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000063,
+    "name": "5.0.4 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000063/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000064/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000064,
+    "name": "5.0.4 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000064/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000065/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000065,
+    "name": "5.0.4 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000065/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000066/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000066,
+    "name": "5.0.4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000066/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000067/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000067,
+    "name": "5.0.5 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000067/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000068/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000068,
+    "name": "5.0.5 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000068/theme.json

@@ -0,0 +1,21 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/submit\/submitFormTemplate",
+            "front\/view\/blogTable",
+            "front\/view\/entry"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000068/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000069/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000069,
+    "name": "5.0.5",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000069/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000070/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000070,
+    "name": "5.0.6 Beta 1",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": true,
+        "themeeditor": true,
+        "javascript": true,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": true,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000070/javascript.json

@@ -0,0 +1,14 @@
+{
+    "files": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [
+            "global\/\/dev\/js\/\/library\/\/jquery"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000070/theme.json

@@ -0,0 +1,19 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/view\/blogViewMedium"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000070/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000071/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000071,
+    "name": "5.0.6 Beta 2",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000071/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000072/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000072,
+    "name": "5.0.6 Beta 3",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000072/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000073/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000073,
+    "name": "5.0.6 Beta 4",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000073/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/setup/upg_5000074/data.json

@@ -0,0 +1,22 @@
+{
+    "id": 5000074,
+    "name": "5.0.6",
+    "steps": {
+        "queries": false,
+        "lang": false,
+        "theme": false,
+        "themeeditor": true,
+        "javascript": false,
+        "emailTemplates": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}

applications/blog/setup/upg_5000074/themeeditor.json

@@ -0,0 +1,14 @@
+{
+    "categories": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    },
+    "settings": {
+        "added": [],
+        "edited": [
+            "layout_blog_view"
+        ],
+        "removed": []
+    }
+}

applications/blog/sources/Blog/Blog.php

@@ -229,6 +229,24 @@ class Blog extends Model implements Embeddable
 		
 		return FALSE;
 	}
+
+	/**
+	 * Check the action column map if the action is enabled in this node
+	 *
+	 * @param string $action
+	 * @return bool
+	 */
+	public function checkAction( string $action ) : bool
+	{
+		/* We don't want any kind of specific comment moderation here, just leave it up to the
+		general rules */
+		if( $action == 'moderate_comments' )
+		{
+			return false;
+		}
+
+		return parent::checkAction( $action );
+	}
 	
 	/**
 	 * Check permissions on any node
@@ -784,31 +802,6 @@ class Blog extends Model implements Embeddable
 		return $values;
 	}
 
-	/**
-	 * [Node] Get the title to store in the log
-	 *
-	 * @return	string|null
-	 */
-	public function titleForLog(): ?string
-	{
-		if ( !$this->member_id )
-		{
-			try
-			{
-				return Lang::load( Lang::defaultLanguage() )->get( static::$titleLangPrefix . $this->_id );
-			}
-			catch( UnderflowException )
-			{
-				/* If we're changing from a member blog to a group blog, the language string won't exist yet */
-				return $this->_title;
-			}
-		}
-		else
-		{
-			return $this->_title;
-		}
-	}
-
 	/**
 	 * @brief	Mass update search index after changes
 	 */
@@ -856,7 +849,7 @@ class Blog extends Model implements Embeddable
 		}
 
 		/* The seo_name isn't set, so let's fix that real quick and return it */
-		$title = $this->member_id ? $this->name : Lang::load( Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id );
+		$title = Lang::load( Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id );
 
 		$seoTitle = Url::seoTitle( $title );
 		$this->seo_name	= $seoTitle;
@@ -1024,9 +1017,9 @@ class Blog extends Model implements Embeddable
 	/**
 	 * [Node] Get number of unapproved content comments
 	 *
-	 * @return	int
+	 * @return	int|null
 	 */
-	protected function get__unapprovedComments(): int
+	protected function get__unapprovedComments(): ?int
 	{
 		return $this->count_comments_hidden;
 	}
@@ -1351,7 +1344,7 @@ class Blog extends Model implements Embeddable
 	 * @param Club $club
 	 * @return    void
 	 */
-	public function clubForm( Form $form, Club $club ) : void
+	public function _clubForm( Form $form, Club $club ) : void
 	{
 		Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js( 'front_view.js', 'blog', 'front' ) );
 

applications/blog/sources/Entry/Entry.php

@@ -377,7 +377,7 @@ class Entry extends Item implements
 	 * @param array $where				Where clause
 	 * @param string|null $order				MySQL ORDER BY clause (NULL to order by date)
 	 * @param int|array|null $limit				Limit clause
-	 * @param string $permissionKey		A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index or NULL to ignore permissions
+	 * @param string|null $permissionKey		A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index or NULL to ignore permissions
 	 * @param int|bool|null $includeHiddenItems	Include hidden items? NULL to detect if currently logged in member has permission, -1 to return public content only, TRUE to return unapproved content and FALSE to only return unapproved content the viewing member submitted
 	 * @param int $queryFlags			Select bitwise flags
 	 * @param	Member|null	$member				The member (NULL to use currently logged in member)
@@ -394,7 +394,7 @@ class Entry extends Item implements
 	 * @param array|null $location			Array of item lat and long
 	 * @return	ActiveRecordIterator|int
 	 */
-	public static function getItemsWithPermission( array $where=array(), string $order=null, int|array|null $limit=10, string $permissionKey='read', int|bool|null $includeHiddenItems= Filter::FILTER_AUTOMATIC, int $queryFlags=0, Member $member=null, bool $joinContainer=FALSE, bool $joinComments=FALSE, bool $joinReviews=FALSE, bool $countOnly=FALSE, array|null $joins=null, bool|Model $skipPermission=FALSE, bool $joinTags=TRUE, bool $joinAuthor=TRUE, bool $joinLastCommenter=TRUE, bool $showMovedLinks=FALSE, array|null $location=null ): ActiveRecordIterator|int
+	public static function getItemsWithPermission( array $where=array(), string $order=null, int|array|null $limit=10, ?string $permissionKey='read', int|bool|null $includeHiddenItems= Filter::FILTER_AUTOMATIC, int $queryFlags=0, Member $member=null, bool $joinContainer=FALSE, bool $joinComments=FALSE, bool $joinReviews=FALSE, bool $countOnly=FALSE, array|null $joins=null, bool|Model $skipPermission=FALSE, bool $joinTags=TRUE, bool $joinAuthor=TRUE, bool $joinLastCommenter=TRUE, bool $showMovedLinks=FALSE, array|null $location=null ): ActiveRecordIterator|int
 	{
 		if ( in_array( $permissionKey, array( 'view', 'read' ) ) )
 		{
@@ -804,11 +804,16 @@ class Entry extends Item implements
 		$response = parent::canComment( $member, $considerPostBeforeRegistering );
 		if( $response )
 		{
-			if ( !$member->member_id and $considerPostBeforeRegistering and Settings::i()->post_before_registering
-				and Login::registrationType() != 'disabled'and Settings::i()->bot_antispam_type !== 'none' )
+			if ( !$member->member_id and ( !$considerPostBeforeRegistering or !Settings::i()->post_before_registering )
+				and Login::registrationType() != 'disabled' )
 			{
+				/* We can override post before register for guests */
 				return (bool) Group::load( Settings::i()->member_group )->g_blog_allowcomment;
 			}
+			elseif( $member->member_id )
+			{
+				return (bool) $member->group['g_blog_allowcomment'];
+			}
 		}
 		
 		return $response;