| @@ -8,9 +8,8 @@ | ||
| 8 | 8 | |
| 9 | 9 | use RadiusTheme\SB\Helpers\Installation; |
| 10 | 10 | use RadiusTheme\SB\Modules\ModuleManager; |
| 11 | 11 | use RadiusTheme\SB\Traits\SingletonTrait; |
| 12 | -use RadiusTheme\SB\Controllers\Shortcodes; | |
| 13 | 12 | use RadiusTheme\SB\Controllers\Dependencies; |
| 14 | 13 | use RadiusTheme\SB\Controllers\Admin\AdminInit; |
| 15 | 14 | use RadiusTheme\SB\Controllers\AssetsController; |
| 16 | 15 | use RadiusTheme\SB\Controllers\BuilderController; |
| @@ -18,9 +17,9 @@ | ||
| 18 | 17 | use RadiusTheme\SB\Controllers\Hooks\FilterHooks; |
| 19 | 18 | use RadiusTheme\SB\Controllers\Hooks\ActionHooks; |
| 20 | 19 | use RadiusTheme\SB\Controllers\Frontend\Ajax\AddToCart; |
| 21 | 20 | use RadiusTheme\SB\Controllers\Frontend\Ajax\AjaxLogin; |
| 22 | -use RadiusTheme\SB\Helpers\Migration; | |
| 21 | +use RadiusTheme\SB\Helpers\Fns; | |
| 23 | 22 | |
| 24 | 23 | // Do not allow directly accessing this file. |
| 25 | 24 | if ( ! defined( 'ABSPATH' ) ) { |
| 26 | 25 | exit( 'This script cannot be accessed directly.' ); |
| @@ -182,16 +181,12 @@ | ||
| 182 | 181 | FilterHooks::init_hooks(); |
| 183 | 182 | ActionHooks::init_hooks(); |
| 184 | 183 | |
| 185 | 184 | Installation::init(); |
| 186 | - Migration::init(); | |
| 187 | - | |
| 188 | 185 | if ( is_admin() ) { |
| 189 | 186 | AdminInit::instance(); |
| 190 | 187 | } |
| 191 | 188 | |
| 192 | - Shortcodes::instance(); | |
| 193 | - | |
| 194 | 189 | do_action( 'rtsb/after/loaded' ); |
| 195 | 190 | } |
| 196 | 191 | |
| 197 | 192 | /** |
| @@ -216,23 +211,9 @@ | ||
| 216 | 211 | /** |
| 217 | 212 | * @return ShopBuilder |
| 218 | 213 | */ |
| 219 | 214 | function rtsb() { |
| 220 | - static $cached_instance; | |
| 221 | - | |
| 222 | - if (null !== $cached_instance) { | |
| 223 | - return $cached_instance; | |
| 224 | - } | |
| 225 | - | |
| 226 | - $cached_instance = wp_cache_get('shopbuilder_instance', 'shopbuilder_cache'); | |
| 227 | - | |
| 228 | - if (false === $cached_instance) { | |
| 229 | - $cached_instance = ShopBuilder::instance(); | |
| 230 | - wp_cache_set('shopbuilder_instance', $cached_instance, 'shopbuilder_cache'); | |
| 231 | - } | |
| 232 | - | |
| 233 | - return $cached_instance; | |
| 215 | + return ShopBuilder::instance(); | |
| 234 | 216 | } |
| 235 | - | |
| 236 | 217 | |
| 237 | 218 | rtsb(); |
| 238 | 219 | } |