← All changes | customify.php +35 -40 1.7.1 → 1.2.3 View file →

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