← All changes | customify.php +39 -30 1.4.0 → 2.3.3 View file →

		@@ -1,11 +1,11 @@
1	1	<?php
2	2	/*
3	3	Plugin Name: Customify
4		-Plugin URI: https://pixelgrade.com
	4	+Plugin URI: https://wordpress.org/plugins/customify/
5	5	Description: A Theme Customizer Booster
6		-Version: 1.4.0
7		-Author: PixelGrade
	6	+Version: 2.3.3
	7	+Author: Pixelgrade
8	8	Author URI: https://pixelgrade.com
9	9	Author Email: contact@pixelgrade.com
10	10	Text Domain: customify
11	11	License: GPL-2.0+
		@@ -10,12 +10,14 @@
10	10	Text Domain: customify
11	11	License: GPL-2.0+
12	12	License URI: http://www.gnu.org/licenses/gpl-2.0.txt
13	13	Domain Path: /languages/
	14	+Requires at least: 4.9
	15	+Tested up to: 5.0.2
14	16	*/
15	17
16	18	// If this file is called directly, abort.
17		-if ( ! defined( 'WPINC' ) ) {
	19	+if ( ! defined( 'ABSPATH' ) ) {
18	20	die;
19	21	}
20	22
21	23	// ensure EXT is defined
		@@ -22,46 +24,53 @@
22	24	if ( ! defined('EXT')) {
23	25	define('EXT', '.php');
24	26	}
25	27
26		-require 'core/bootstrap'.EXT;
	28	+require 'core/bootstrap.php';
27	29
28		-$config = include 'plugin-config'.EXT;
	30	+// Include our helper array class.
	31	+require 'includes/lib/class-customify-array.php';
29	32
	33	+$config = include 'plugin-config.php';
	34	+
30	35	// set textdomain
31		-pixcustomify::settextdomain('customify');
	36	+pixcustomify::settextdomain( 'customify' );
32	37
33	38	// Ensure Test Data
34	39	// ----------------
35	40
36		-$defaults = include 'plugin-defaults'.EXT;
	41	+$defaults = include 'plugin-defaults.php';
37	42
38		-$current_data = get_option($config['settings-key']);
	43	+$current_data = get_option( $config['settings-key'] );
39	44
40		-if ($current_data === false) {
41		- add_option($config['settings-key'], $defaults);
	45	+if ( $current_data === false ) {
	46	+ add_option( $config['settings-key'], $defaults );
	47	+} elseif ( count( array_diff_key( $defaults, $current_data ) ) != 0) {
	48	+ $plugindata = array_merge( $defaults, $current_data );
	49	+ update_option( $config['settings-key'], $plugindata );
42	50	}
43		-else if (count(array_diff_key($defaults, $current_data)) != 0) {
44		- $plugindata = array_merge($defaults, $current_data);
45		- update_option($config['settings-key'], $plugindata);
46		-}
47	51	# else: data is available; do nothing
48	52
49		-// Load Callbacks
50		-// --------------
	53	+/**
	54	+ * Returns the main instance of PixCustomifyPlugin to prevent the need to use globals.
	55	+ *
	56	+ * @since 1.5.0
	57	+ * @return PixCustomifyPlugin
	58	+ */
	59	+function PixCustomifyPlugin() {
	60	+ /**
	61	+ * The core plugin class that is used to define internationalization,
	62	+ * admin-specific hooks, and public-facing site hooks.
	63	+ */
	64	+ require_once plugin_dir_path( __FILE__ ) . 'class-pixcustomify.php';
51	65
52		-$basepath = dirname(__FILE__).DIRECTORY_SEPARATOR;
53		-$callbackpath = $basepath.'callbacks'.DIRECTORY_SEPARATOR;
54		-pixcustomify::require_all($callbackpath);
	66	+ $instance = PixCustomifyPlugin::instance( __FILE__, '2.3.3' );
55	67
56		-require_once( plugin_dir_path( __FILE__ ) . 'class-pixcustomify.php' );
	68	+ return $instance;
	69	+}
57	70
58		-// Register hooks that are fired when the plugin is activated, deactivated, and uninstalled, respectively.
59		-register_activation_hook( __FILE__, array( 'PixCustomifyPlugin', 'activate' ) );
60		-//register_deactivation_hook( __FILE__, array( 'customifyPlugin', 'deactivate' ) );
	71	+// Now get the party started
	72	+// We will keep this global variable for legacy
	73	+$pixcustomify_plugin = PixCustomifyPlugin();
61	74
62		-
63		-function customify_init_plugin () {
64		- global $pixcustomify_plugin;
65		- $pixcustomify_plugin = PixCustomifyPlugin::get_instance();
66		-}
67		-add_action('plugins_loaded', 'customify_init_plugin', 20 );
	75	+// Load custom modules
	76	+require_once( 'features/class-Font_Selector.php' );