Usunięcie Singleton, wersja 1.6

classes/wpdesk/class-plugin.php

@@ -43,6 +43,12 @@ if ( ! class_exists( 'WPDesk_Plugin_1_6' ) ) {
 
 	    protected function __construct( $plugin_data = false ) {
 	    	$this->init_base_variables();
+		    if ( $this->plugin_is_active ) {
+			    if ( $this->plugin_has_settings ) {
+				    $this->settings = new WPDesk_Settings_1_6( $this, $this->get_namespace(), $this->default_settings_tab );
+				    $this->options = $this->settings->get_settings();
+			    }
+		    }
 		    $this->hooks();
     	}
 

plugin-template.php

@@ -69,12 +69,6 @@
 					$this->plugin_is_active = false;
 				}
 			}
-			if ( $this->plugin_is_active ) {
-				if ( $this->plugin_has_settings ) {
-					$this->settings = new WPDesk_Settings_1_6( $this, $this->get_namespace(), $this->default_settings_tab );
-					$this->options = $this->settings->get_settings();
-				}
-			}
 
 			parent::__construct( $plugin_data );