do not abort MTSitesLocalSite when local_blog_id is empty

movabletype · Sep 29, 2022 · 5fd0d9a · 5fd0d9a
1 parent 070a519
commit 5fd0d9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/php/lib/block.mtsiteslocalsite.php b/php/lib/block.mtsiteslocalsite.php
@@ -8,15 +8,14 @@
 function smarty_block_mtsiteslocalsite($args, $content, &$ctx, &$repeat) {
     $localvars = array('local_blog_id', 'blog_id', 'blog');
     if (!isset($content)) {
-        $blog_id = $ctx->stash('local_blog_id');
-        if (!$blog_id) {
-            $repeat = false;
-            return '';
+        $blog_id = $ctx->stash('blog_id');
+        $local_blog_id = $ctx->stash('local_blog_id');
+        if ($local_blog_id) {
+            $ctx->localize($localvars);
+            $blog = $ctx->mt->db()->fetch_blog($local_blog_id);
+            $ctx->stash('blog_id', $local_blog_id);
+            $ctx->stash('blog', $blog);
         }
-        $ctx->localize($localvars);
-        $blog = $ctx->mt->db()->fetch_blog($blog_id);
-        $ctx->stash('blog', $blog);
-        $ctx->stash('blog_id', $blog_id);
     } else {
         $repeat = false;
     }

diff --git a/t/mt7/multiblog/02.tags.t b/t/mt7/multiblog/02.tags.t
@@ -583,7 +583,6 @@ template-module:2
 { 1 => 2, 2 => 2 }
 
 === MTC-28598 mt:MultiBlogLocalBlog inside mt:Tags
---- skip_php
 --- template
 <mt:MultiBlog mode="context">:<MTTags glue=','><mt:BlogID>:<mt:MultiBlogLocalBlog><mt:BlogID></mt:MultiBlogLocalBlog></MTTags></mt:MultiBlog>
 --- expected