From ec75b247fbf1e7e9005bdfcf1af2dd8a4cae7cda Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 29 Jan 2017 09:29:30 -0800
Subject: [PATCH] Issue #2344 Shortcodes loading in admin.

---
 e107_handlers/shortcode_handler.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 1de80dcdc..64ce05122 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -112,10 +112,12 @@ class e_parse_shortcode
 		{
 			$this->loadOverrideShortcodes();
 			$this->loadThemeShortcodes();
-			$this->loadPluginShortcodes();
-			$this->loadPluginSCFiles();
-
 		}
+
+		$this->loadPluginShortcodes();
+		$this->loadPluginSCFiles();
+
+		
 		//$this->loadCoreShortcodes(); DEPRECATED
 
 		$editableActivePref = e107::getPref('inline_editing',255);