Improve sidebar shortcode

config.codekit3

@@ -1987,14 +1987,6 @@
       "oAP" : "\/searchform.php",
       "oF" : 1
     },
-    "\/sidebar-fictioneer-sidebar.php" : {
-      "cB" : 0,
-      "ft" : 8192,
-      "hM" : 0,
-      "oA" : 1,
-      "oAP" : "\/sidebar-fictioneer-sidebar.php",
-      "oF" : 1
-    },
     "\/single-fcn_chapter.php" : {
       "cB" : 0,
       "ft" : 8192,

includes/functions/_setup-shortcodes.php

@@ -2112,8 +2112,18 @@ function fictioneer_shortcode_sidebar( $attr ) {
   // Buffer
   ob_start();
 
-  // Output sidebar
-  get_sidebar( $name );
+  // Does sidebar exist?
+  if ( ! is_active_sidebar( $name ) ) {
+    return;
+  }
+
+  // Start HTML ---> ?>
+  <div class="fictioneer-sidebar _shortcode">
+    <div class="fictioneer-sidebar__wrapper">
+      <?php dynamic_sidebar( $name ); ?>
+    </div>
+  </div>
+  <?php // <--- End HTML
 
   // Capture and return buffer
   return ob_get_clean();

sidebar-fictioneer-sidebar.php

@@ -1,20 +0,0 @@
-<?php
-/**
- * Sidebar
- *
- * @package WordPress
- * @subpackage Fictioneer
- * @since 5.20.0
- */
-
-
-// No direct access!
-defined( 'ABSPATH' ) OR exit;
-
-?>
-
-<div id="fictioneer-sidebar" class="fictioneer-sidebar">
-	<div class="fictioneer-sidebar__wrapper">
-		<?php dynamic_sidebar( 'fictioneer-sidebar' ); ?>
-	</div>
-</div>