Usunięcie Singleton, wersja 1.6

classes/class-plugin-template-settings-hooks.php

@@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
  	
  	private $_plugin;
  	
- 	public function __construct( WPDesk_Plugin_1_5 $plugin ) {
+ 	public function __construct( WPDesk_Plugin_1_6 $plugin ) {
  		$this->_plugin = $plugin;
  		$this->hooks();
  	}

classes/wpdesk/class-plugin.php

@@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 require_once 'functions.php';
 
-if ( ! class_exists( 'WPDesk_Plugin_1_5' ) ) {
+if ( ! class_exists( 'WPDesk_Plugin_1_6' ) ) {
 
 	require_once 'class-settings.php';
 
@@ -14,9 +14,9 @@ if ( ! class_exists( 'WPDesk_Plugin_1_5' ) ) {
 	 * @author Grzegorz
 	 *
 	 */
-    class WPDesk_Plugin_1_5 {
+    class WPDesk_Plugin_1_6 {
 
-    	const VERSION = '1.4';
+    	const VERSION = '1.6';
 
     	private $_plugin_is_active = true;
 
@@ -41,15 +41,6 @@ if ( ! class_exists( 'WPDesk_Plugin_1_5' ) ) {
 	    public $settings = null;
 	    public $options = null;
 
-	    static $_instance = null;
-
-	    public static function get_instance( $plugin_data ) {
-		    if ( self::$_instance == null ) {
-			    self::$_instance = new self( $plugin_data );
-		    }
-		    return self::$_instance;
-	    }
-
 	    protected function __construct( $plugin_data = false ) {
 	    	$this->init_base_variables();
 	    	if ( is_array( $plugin_data ) && count( $plugin_data ) ) {
@@ -65,7 +56,7 @@ if ( ! class_exists( 'WPDesk_Plugin_1_5' ) ) {
 	    	}
 	    	if ( $this->_plugin_is_active ) {
 	    		if ( $this->_plugin_has_settings ) {
-	    			$this->settings = new WPDesk_Settings_1_5( $this, $this->get_namespace(), $this->_default_settings_tab );
+	    			$this->settings = new WPDesk_Settings_1_6( $this, $this->get_namespace(), $this->_default_settings_tab );
 	    			$this->options = $this->settings->get_settings();
 	    		}
 	    	}

classes/wpdesk/class-settings.php

@@ -2,9 +2,9 @@
 
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
-if ( ! class_exists( 'WPDesk_Settings_1_5' ) ) {
+if ( ! class_exists( 'WPDesk_Settings_1_6' ) ) {
 
-	if ( ! class_exists( 'WPDesk_S214_Settings_1_5' ) ) {
+	if ( ! class_exists( 'WPDesk_S214_Settings_1_6' ) ) {
 		require_once 'settings-api/class.s214-settings.php';
 	}
 
@@ -14,7 +14,7 @@ if ( ! class_exists( 'WPDesk_Settings_1_5' ) ) {
 	 * @author Grzegorz
 	 *
 	 */
-     class WPDesk_Settings_1_5 extends WPDesk_S214_Settings_1_5 {
+     class WPDesk_Settings_1_6 extends WPDesk_S214_Settings_1_6 {
 
         protected $version = '1.0';
 
@@ -24,7 +24,7 @@ if ( ! class_exists( 'WPDesk_Settings_1_5' ) ) {
 
         protected $func = 'wpdesk_plugin';
 
-        public function __construct( WPDesk_Plugin_1_5 $plugin, $slug = 'wpdesk-settings', $default_tab = 'general' ) {
+        public function __construct( WPDesk_Plugin_1_6 $plugin, $slug = 'wpdesk-settings', $default_tab = 'general' ) {
             parent::__construct( $slug, $default_tab );
             $this->slug = $slug;
             $this->plugin = $plugin;

classes/wpdesk/settings-api/class.s214-settings.php

@@ -18,7 +18,7 @@ if( ! defined( 'ABSPATH' ) ) {
  *
  * @since       1.0.0
  */
-class WPDesk_S214_Settings_1_5 {
+class WPDesk_S214_Settings_1_6 {
 
 
 	/**

plugin-template.php

@@ -42,16 +42,9 @@
 	
 	require_once( plugin_basename( 'classes/wpdesk/class-plugin.php' ) );
 		
-	class WPDesk_Plugin_Template_Plugin extends WPDesk_Plugin_1_5 {
+	class WPDesk_Plugin_Template_Plugin extends WPDesk_Plugin_1_6 {
 
-		public static function get_instance( $plugin_data ) {
-			if ( self::$_instance == null ) {
-				self::$_instance = new self( $plugin_data );
-			}
-			return self::$_instance;
-		}
-
-		protected function __construct( $plugin_data ) {
+		public function __construct( $plugin_data ) {
 			
 			$this->_plugin_namespace = 'plugin-template';
 			$this->_plugin_text_domain = 'plugin-template';
@@ -75,5 +68,12 @@
 
 	}
 
-	$GLOBALS['plugin_template'] = WPDesk_Plugin_Template_Plugin::get_instance( $plugin_data );
+	$wpdesk_plugin_template_plugin_data = $plugin_data;
+	function wpdesk_plugin_template() {
+		global $wpdesk_plugin_template;
+		global $wpdesk_plugin_template_plugin_data;
+		if ( !isset( $wpdesk_plugin_template ) ) {
+			$wpdesk_plugin_template = new WPDesk_Plugin_Template_Plugin( $wpdesk_plugin_template_plugin_data );
+		}
+	}