Version 5.0.13

applications/cms/modules/front/database/category.php

@@ -665,12 +665,6 @@ class category extends Controller
 		}
 		else
 		{
-			Output::i()->metaTags['title'] = $category->metaTitle();
-			Output::i()->metaTags['description'] = $category->metaDescription();
-			Output::i()->metaTags['og:title'] = $category->metaTitle();
-			Output::i()->metaTags['og:description'] = $category->metaDescription();
-			Output::i()->linkTags['canonical'] = (string) $category->url();
-
 			/* Set breadcrumb */
 			if ( $club = $category->_club )
 			{
@@ -687,6 +681,12 @@ class category extends Controller
 			}
 		}
 
+        Output::i()->metaTags['title'] = $category->metaTitle();
+        Output::i()->metaTags['description'] = $category->metaDescription();
+        Output::i()->metaTags['og:title'] = $category->metaTitle();
+        Output::i()->metaTags['og:description'] = $category->metaDescription();
+        Output::i()->linkTags['canonical'] = (string) $category->url();
+
 		/* Node handler does not support keywords, so we need to do it manually */
 		if ( $category->meta_keywords )
 		{
@@ -772,7 +772,6 @@ class category extends Controller
 		}
 
 		$this->showClubHeader( $category );
-		Output::i()->allowDefaultWidgets = FALSE;
 		Output::i()->sidebar['enabled'] = FALSE;
 		Output::i()->output = $form->customTemplate( array( \IPS\cms\Theme::i()->getTemplate( $database->template_form, 'cms', 'database' ), 'recordForm' ), NULL, $category, $database, Page::$currentPage, $title, $hasModOptions );
 		Dispatcher::i()->output .= Output::i()->output;

applications/cms/modules/front/database/record.php

@@ -88,6 +88,7 @@ class record extends Controller
 	protected function manage() : mixed
 	{
 		/* Load record */
+		/** @var Records $record */
 		try
 		{
 			$record = parent::manage();
@@ -318,11 +319,11 @@ class record extends Controller
 		}
 
 		$logo = NULL;
-		if( Theme::i()->logo['front'] )
+		if( !empty( Theme::i()->logo['front']['url'] ) )
 		{
 			try
 			{
-				$logo = File::get( 'core_Theme', Theme::i()->logo['front']['url'] )->url;
+				$logo = Theme::i()->logo['front']['url'];
 			}
 				/* File doesn't exist */
 			catch ( RuntimeException | DomainException $e ){}
@@ -795,7 +796,6 @@ class record extends Controller
 			Output::i()->redirect( $record->url() );
 		}
 		
-		Output::i()->allowDefaultWidgets = FALSE;
 		Output::i()->sidebar['enabled'] = FALSE;
 		Output::i()->title = Member::loggedIn()->language()->addToStack( $title );
 		Output::i()->cssFiles = array_merge( Output::i()->cssFiles, Theme::i()->css( 'records/form.css', 'cms', 'front' ) );

applications/cms/modules/front/database/topic.php

@@ -220,6 +220,7 @@ class topic extends Controller
 		$fakeRecord->$titleField	= $this->topic->mapped('title');
 		$fakeRecord->$contentField	= $this->topic->content();
 		$fakeRecord->category_id	= Request::i()->category_id;
+        Request::i()->tags = $this->topic->tags();
 
 		if( $fakeRecord->_forum_record AND $fakeRecord->_forum_comments )
 		{
@@ -322,6 +323,12 @@ class topic extends Controller
 					$obj->rebuildFirstAndLastCommentData();
 				}
 
+                /* Remove tags from the original topic, so that we don't have duplicates on the tag page */
+                $this->topic->setTags( [] );
+
+                /* Now we want to update the original topic in case we made any changes */
+                $record->syncTopic();
+
 				try
 				{
 					/* If the database is on a page, go to the record */