AMP for WP – Accelerated Mobile Pages

Version Description

Release Info

Developer	mohammed_kaludi
Plugin	AMP for WP – Accelerated Mobile Pages
Version	0.9.97.42
Comparing to
See all releases

Code changes from version 0.9.97.41 to 0.9.97.42

Files changed (95) hide show

README.md +1 -10
accelerated-moblie-pages.php +22 -12
changelog.txt +0 -9
includes/options/admin-config.php +1 -35
includes/options/extensions/amp_slider/amp_slider/field_amp_slider.php +2 -2
includes/options/extensions/amp_slider/extension_amp_slider.php +2 -3
includes/options/extensions/checkbox_hierarchy/checkbox_hierarchy/field_checkbox_hierarchy.php +3 -3
includes/options/extensions/checkbox_hierarchy/extension_checkbox_hierarchy.php +2 -3
includes/options/extensions/demolink_image_select/demolink_image_select/field_demolink_image_select.php +3 -3
includes/options/extensions/demolink_image_select/extension_demolink_image_select.php +0 -1
includes/options/extensions/loader.php +2 -3
includes/options/extensions/vendor_support/extension_vendor_support.php +2 -3
includes/options/extensions/vendor_support/vendor_support/class.vendor-url.php +2 -2
includes/options/extensions/vendor_support/vendor_support/extension_vendor_support.php +2 -2
includes/options/redux-core/core/enqueue.php +6 -9
includes/options/redux-core/core/newsflash.php +2 -2
includes/options/redux-core/core/panel.php +2 -2
includes/options/redux-core/core/required.php +2 -2
includes/options/redux-core/framework.php +22 -22
includes/options/redux-core/inc/browser.php +1 -1
includes/options/redux-core/inc/class.p.php +1 -2
includes/options/redux-core/inc/class.redux_admin_notices.php +3 -3
includes/options/redux-core/inc/class.redux_api.php +8 -9
includes/options/redux-core/inc/class.redux_cdn.php +4 -4
includes/options/redux-core/inc/class.redux_filesystem.php +3 -3
includes/options/redux-core/inc/class.redux_functions.php +2 -3
includes/options/redux-core/inc/class.redux_helpers.php +6 -6
includes/options/redux-core/inc/class.redux_instances.php +2 -2
includes/options/redux-core/inc/class.thirdparty.fixes.php +0 -1
includes/options/redux-core/inc/extensions/customizer/extension_customizer.php +6 -6
includes/options/redux-core/inc/extensions/customizer/inc/customizer_control.php +3 -3
includes/options/redux-core/inc/extensions/customizer/inc/customizer_devs.php +4 -4
includes/options/redux-core/inc/extensions/customizer/inc/customizer_fields.php +0 -1
includes/options/redux-core/inc/extensions/customizer/inc/customizer_panel.php +4 -4
includes/options/redux-core/inc/extensions/customizer/inc/customizer_section.php +2 -2
includes/options/redux-core/inc/extensions/import_export/extension_import_export.php +2 -2
includes/options/redux-core/inc/extensions/import_export/import_export/field_import_export.php +3 -4
includes/options/redux-core/inc/extensions/options_object/extension_options_object.php +3 -3
includes/options/redux-core/inc/extensions/options_object/options_object/field_options_object.php +1 -2
includes/options/redux-core/inc/fields/ace_editor/field_ace_editor.php +2 -2
includes/options/redux-core/inc/fields/background/field_background.php +2 -2
includes/options/redux-core/inc/fields/border/field_border.php +2 -2
includes/options/redux-core/inc/fields/button_set/field_button_set.php +2 -2
includes/options/redux-core/inc/fields/checkbox/field_checkbox.php +2 -2
includes/options/redux-core/inc/fields/color/field_color.php +2 -2
includes/options/redux-core/inc/fields/color_gradient/field_color_gradient.php +2 -2
includes/options/redux-core/inc/fields/color_rgba/field_color_rgba.php +2 -2
includes/options/redux-core/inc/fields/date/field_date.php +1 -1
includes/options/redux-core/inc/fields/dimensions/field_dimensions.php +5 -5
includes/options/redux-core/inc/fields/divide/field_divide.php +1 -1
includes/options/redux-core/inc/fields/editor/field_editor.php +1 -1
includes/options/redux-core/inc/fields/gallery/field_gallery.php +1 -1
includes/options/redux-core/inc/fields/image_select/field_image_select.php +1 -1
includes/options/redux-core/inc/fields/info/field_info.php +1 -1
includes/options/redux-core/inc/fields/link_color/field_link_color.php +1 -1
includes/options/redux-core/inc/fields/media/field_media.php +1 -1
includes/options/redux-core/inc/fields/multi_text/field_multi_text.php +5 -5
includes/options/redux-core/inc/fields/palette/field_palette.php +1 -1
includes/options/redux-core/inc/fields/password/field_password.php +1 -1
includes/options/redux-core/inc/fields/radio/field_radio.php +1 -1
includes/options/redux-core/inc/fields/raw/field_raw.php +1 -1
includes/options/redux-core/inc/fields/section/field_section.php +0 -1
includes/options/redux-core/inc/fields/select/elusive-icons.php +2 -2
includes/options/redux-core/inc/fields/select/field_select.php +1 -1
includes/options/redux-core/inc/fields/select_image/field_select_image.php +1 -1
includes/options/redux-core/inc/fields/slider/field_slider.php +1 -1
includes/options/redux-core/inc/fields/slides/field_slides.php +1 -1
includes/options/redux-core/inc/fields/sortable/field_sortable.php +1 -1
includes/options/redux-core/inc/fields/sorter/field_sorter.php +2 -3
includes/options/redux-core/inc/fields/spacing/field_spacing.php +1 -1
includes/options/redux-core/inc/fields/spinner/field_spinner.php +1 -1
includes/options/redux-core/inc/fields/switch/field_switch.php +2 -4
includes/options/redux-core/inc/fields/text/field_text.php +1 -1
includes/options/redux-core/inc/fields/textarea/field_textarea.php +1 -1
includes/options/redux-core/inc/fields/typography/field_typography.php +5 -5
includes/options/redux-core/inc/fields/upload/field_upload.php +0 -1
includes/options/redux-core/inc/lib.redux_instances.php +1 -1
includes/options/redux-core/inc/themecheck/class.redux_themecheck.php +0 -1
includes/options/redux-core/inc/tracking.php +6 -6
includes/options/redux-core/inc/welcome/views/status_report.php +0 -1
includes/options/redux-core/inc/welcome/welcome.php +1 -2
includes/options/redux-core/templates/panel/container.tpl.php +0 -1
includes/options/redux-core/templates/panel/content.tpl.php +0 -1
includes/options/redux-core/templates/panel/footer.tpl.php +0 -1
includes/options/redux-core/templates/panel/header.tpl.php +0 -2
includes/options/redux-core/templates/panel/header_stickybar.tpl.php +0 -1
includes/options/redux-core/templates/panel/menu_container.tpl.php +0 -1
includes/redirect.php +1 -19
includes/vendor/amp/includes/lib/fasterimage/FasterImage.php +5 -6
readme.txt +11 -9
templates/design-manager/design-1/style.php +0 -5
templates/design-manager/design-2/style.php +1 -5
templates/design-manager/design-3/style.php +1 -5
templates/features.php +3 -6
templates/frontpage-elements.php +0 -2

README.md CHANGED Viewed

	@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.1
7	- Stable tag: 0.9.97.41
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -185,15 +185,6 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
185
186	== Changelog ==
187
188	- = 0.9.97.41 (11th March 2019) =
189	- * Added: Color picker for Footer Area #2320
190	- * Added: Compatibility with WP User Avatar plugin to show the gravatar #2772
191	- * Fixed: Options Panel not showing, says "You are not allowed to access this page" #2377
192	- * Fixed: faster-image libraries not being able to determine dimensions #2692
193	- * Fixed: Changes in endpoint to ?amp, Re-direct " /amp " to " ?amp " #2480
194	- * Fixed: Font style getting change on Custom Front page #2594
195	- * Fixed: When the user is directed to the AMP version of the page it changes the URL slighltly (swaps out characters) #2913
196	-
197	= 0.9.97.40 (9th March 2019) =
198	* Added: Smooth scrolling for anchors links and jumping links within a page #2062
199	* Added: Option to Enable/Disable Merriweather font in Design-1


4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.1
7	+ Stable tag: 0.9.97.42
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

185
186	== Changelog ==
187









188	= 0.9.97.40 (9th March 2019) =
189	* Added: Smooth scrolling for anchors links and jumping links within a page #2062
190	* Added: Option to Enable/Disable Merriweather font in Design-1

accelerated-moblie-pages.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: Accelerated Mobile Pages
4	Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5	Description: AMP for WP - Accelerated Mobile Pages for WordPress
6	- Version: 0.9.97.41
7	Author: Ahmed Kaludi, Mohammed Kaludi
8	Author URI: https://ampforwp.com/
9	Donate link: https://www.paypal.me/Kaludi/25
	@@ -20,7 +20,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
20	define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21	define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22	define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23	- define('AMPFORWP_VERSION','0.9.97.41');
24	// any changes to AMP_QUERY_VAR should be refelected here
25	function ampforwp_generate_endpoint(){
26	$ampforwp_slug = '';
	@@ -441,17 +441,27 @@ if( !function_exists('ampforwp_upcomming_layouts_demo') ){
441	);
442	}
443	}
444	- ~~require_once~~ ~~dirname(~~ ~~__FILE__~~ ~~).'/includes/options/redux-core/framework.php';~~
445	- ~~require_once dirname~~( ~~__FILE__~~ ).'/includes/~~options/extensions/loader~~.php';
446	- ~~add_action('after_setup_theme',~~ ~~'ampforwp_include_options_file'~~ );
447	- ~~function~~ ~~ampforwp_include_options_file~~(){
448	- if ( ~~is_admin~~() ~~) {~~
449	- // ~~Register~~ ~~all~~ ~~the main options~~
450	- ~~require_once~~ ~~dirname~~( ~~__FILE__ )~~.'/~~includes~~/~~options/admin~~-~~config~~.php';
451	- ~~require_once~~ ~~dirname(~~ ~~__FILE__ ).~~'~~/templates/report-bugs.php~~';
452	- }
453	- }
454











455	function ampforwp_load_amp_options(){
456	if ( ! class_exists( 'ReduxFramework' ) ) {
457	require_once dirname( __FILE__ ).'/includes/options/extensions/loader.php';


3	Plugin Name: Accelerated Mobile Pages
4	Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5	Description: AMP for WP - Accelerated Mobile Pages for WordPress
6	+ Version: 0.9.97.42
7	Author: Ahmed Kaludi, Mohammed Kaludi
8	Author URI: https://ampforwp.com/
9	Donate link: https://www.paypal.me/Kaludi/25

20	define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21	define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22	define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23	+ define('AMPFORWP_VERSION','0.9.97.42');
24	// any changes to AMP_QUERY_VAR should be refelected here
25	function ampforwp_generate_endpoint(){
26	$ampforwp_slug = '';

441	);
442	}
443	}
444	+ // Redux panel inclusion code
445	+ include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
446	+ $amp_plugin_manager_version = array();
447	+ $plugin_manager_active = is_plugin_active('amp-plugin-manager/ampforwp-3rd-party-plugin-creator.php');
448	+ $amp_plugin_manager_active = is_plugin_active('plugin-manager/ampforwp-3rd-party-plugin-creator.php');
449	+ if ( $plugin_manager_active) {
450	+ $amp_plugin_manager = get_plugin_data(AMPFORWP_MAIN_PLUGIN_DIR.'/amp-plugin-manager/ampforwp-3rd-party-plugin-creator.php');
451	+ $amp_plugin_manager_version = $amp_plugin_manager['Version'];
452	+ }

453
454	+ if ( $amp_plugin_manager_active) {
455	+ $plugin_manager = get_plugin_data(AMPFORWP_MAIN_PLUGIN_DIR.'/plugin-manager/ampforwp-3rd-party-plugin-creator.php');
456	+ $amp_plugin_manager_version = $plugin_manager['Version'];
457	+ }
458	+ if ( $plugin_manager_active \|\| $amp_plugin_manager_active ) {
459	+ if ( (! class_exists( 'ReduxFramework' ) && $GLOBALS['pagenow']=='admin.php' && $_GET['page']=='amp_options') \|\| is_plugin_active('redux-framework/redux-framework.php') \|\| '1.0' == $amp_plugin_manager_version ) {
460	+ require_once dirname( __FILE__ ).'/includes/options/extensions/loader.php';
461	+ require_once dirname( __FILE__ ).'/includes/options/redux-core/framework.php';
462	+ }
463	+ }
464	+ add_action('after_setup_theme', 'ampforwp_load_amp_options');
465	function ampforwp_load_amp_options(){
466	if ( ! class_exists( 'ReduxFramework' ) ) {
467	require_once dirname( __FILE__ ).'/includes/options/extensions/loader.php';

changelog.txt CHANGED Viewed

@@ -1,14 +1,5 @@
             == Changelog ==
-            -
            = 0.9.97.41 (11th March 2019) =
-            -
            * Added: Color picker for Footer Area #2320
-            -
            * Added: Compatibility with WP User Avatar plugin to show the gravatar #2772
-            -
            * Fixed: Options Panel not showing, says "You are not allowed to access this page" #2377
-            -
            * Fixed: faster-image libraries not being able to determine dimensions #2692
-            -
            * Fixed: Changes in endpoint to ?amp, Re-direct " /amp " to " ?amp " #2480
-            -
            * Fixed: Font style getting change on Custom Front page #2594
-            -
            * Fixed: When the user is directed to the AMP version of the page it changes the URL slighltly (swaps out characters) #2913
-            -
             = 0.9.97.40 (9th March 2019) =
             * Added: Smooth scrolling for anchors links and jumping links within a page #2062
             * Added: Option to Enable/Disable Merriweather font in Design-1

             == Changelog ==
             = 0.9.97.40 (9th March 2019) =
             * Added: Smooth scrolling for anchors links and jumping links within a page #2062
             * Added: Option to Enable/Disable Merriweather font in Design-1

includes/options/admin-config.php CHANGED Viewed

@@ -1,7 +1,6 @@
             <?php
-            -
            use ReduxCore\ReduxFramework\Redux;
             //Admin Panel Options
-            -
            if ( ! class_exists( 'ReduxCore\ReduxFramework\Redux' ) ) {
                 return;
+            }
             // Option name where all the Redux data is stored.
@@ -6358,39 +6357,6 @@ else{
                                     'title'    => esc_html__('Make "View Non-AMP" link nofollow', 'accelerated-mobile-pages'),
                                     'default'   => 0
                             ),
-            -
                            array(
-            -
                                    'id'       => 'ampforwp-footer-background-color-1',
-            -
                                    'type'     => 'color_rgba',
-            -
                                    'title'    => esc_html__('Footer Background Color', 'accelerated-mobile-pages'),
-            -
                                    'default'   => array(
-            -
                                            'color' => '#FFFFFF'
-            -
                                    ),
-            -
                                    'required'  => array(
-            -
                                        array('amp-design-selector', '=' , '1')
-            -
                                    )
-            -
                            ),
-            -
                            array(
-            -
                                    'id'       => 'ampforwp-footer-background-color-2',
-            -
                                    'type'     => 'color_rgba',
-            -
                                    'title'    => esc_html__('Footer Background Color', 'accelerated-mobile-pages'),
-            -
                                    'default'   => array(
-            -
                                            'color' => '#FFFFFF'
-            -
                                    ),
-            -
                                    'required'  => array(
-            -
                                        array('amp-design-selector', '=' , '2')
-            -
                                    )
-            -
                            ),
-            -
                            array(
-            -
                                    'id'       => 'ampforwp-footer-background-color-3',
-            -
                                    'type'     => 'color_rgba',
-            -
                                    'title'    => esc_html__('Footer Background Color', 'accelerated-mobile-pages'),
-            -
                                    'default'   => array(
-            -
                                            'color' => '#151515'
-            -
                                    ),
-            -
                                    'required'  => array(
-            -
                                        array('amp-design-selector', '=' , '3')
-            -
                                    )
-            -
                            ),
                         array(
                                'id' => 'footer-tab-2',
                                'type' => 'section',

             <?php
             //Admin Panel Options
+            +
            if ( ! class_exists( 'Redux' ) ) {
                 return;
+            }
             // Option name where all the Redux data is stored.
                                     'title'    => esc_html__('Make "View Non-AMP" link nofollow', 'accelerated-mobile-pages'),
                                     'default'   => 0
                             ),
                         array(
                                'id' => 'footer-tab-2',
                                'type' => 'section',

includes/options/extensions/amp_slider/amp_slider/field_amp_slider.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
23	exit;
24	}
25
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_amp_slider' ) ) {
27	class ReduxFramework_amp_slider {
28
29	/**


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	exit;
24	}
25
26	+ if ( ! class_exists( 'ReduxFramework_amp_slider' ) ) {
27	class ReduxFramework_amp_slider {
28
29	/**

includes/options/extensions/amp_slider/extension_amp_slider.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -21,7 +20,7 @@ namespace ReduxCore\ReduxFramework;
21	// Exit if accessed directly
22	if( !defined( 'ABSPATH' ) ) exit;
23	// Don't duplicate me!
24	- if( !class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_amp_slider' ) ) {
25	/**
26	* Main ReduxFramework demolink_image_select extension class
27	*
	@@ -62,12 +61,12 @@ if( !class_exists( 'ReduxCore\\ReduxFramework\\ReduxFramework_extension_amp_slid
62	return;
63	}
64
65	- $this->field_name = 'amp_slider';
66	if ( empty( $this->extension_dir ) ) {
67	$this->extension_dir = trailingslashit( str_replace( '\\', '/', dirname( __FILE__ ) ) );
68	$this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
69	}
70

71	self::$theInstance = $this;
72	add_filter( 'redux/'.$this->parent->args['opt_name'].'/field/class/'.$this->field_name, array( &$this, 'overload_field_path' ) ); // Adds the local field
73	}


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

20	// Exit if accessed directly
21	if( !defined( 'ABSPATH' ) ) exit;
22	// Don't duplicate me!
23	+ if( !class_exists( 'ReduxFramework_extension_amp_slider' ) ) {
24	/**
25	* Main ReduxFramework demolink_image_select extension class
26	*

61	return;
62	}
63

64	if ( empty( $this->extension_dir ) ) {
65	$this->extension_dir = trailingslashit( str_replace( '\\', '/', dirname( __FILE__ ) ) );
66	$this->extension_url = site_url( str_replace( trailingslashit( str_replace( '\\', '/', ABSPATH ) ), '', $this->extension_dir ) );
67	}
68
69	+ $this->field_name = 'amp_slider';
70	self::$theInstance = $this;
71	add_filter( 'redux/'.$this->parent->args['opt_name'].'/field/class/'.$this->field_name, array( &$this, 'overload_field_path' ) ); // Adds the local field
72	}

includes/options/extensions/checkbox_hierarchy/checkbox_hierarchy/field_checkbox_hierarchy.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +22,7 @@ if ( !defined ( 'ABSPATH' ) ) {
23	exit;
24	}
25	// Don't duplicate me!
26	- if ( !class_exists ( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_checkbox_hierarchy' ) ) {
27	/**
28	* Main ReduxFramework_checkbox class
29	*
	@@ -42,7 +41,8 @@ if ( !class_exists ( 'ReduxCore\\ReduxFramework\\ReduxFramework_checkbox_hierarc
42	$this->parent = $parent;
43	$this->field = $field;
44	$this->value = $value;
45	- ~~if ( defined('AMPFORWP_VERSION') ) {~~

46	$this->time = AMPFORWP_VERSION;
47	}
48	if ( empty( $this->extension_dir ) ) {


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

22	exit;
23	}
24	// Don't duplicate me!
25	+ if ( !class_exists ( 'ReduxFramework_checkbox_hierarchy' ) ) {
26	/**
27	* Main ReduxFramework_checkbox class
28	*

41	$this->parent = $parent;
42	$this->field = $field;
43	$this->value = $value;
44	+
45	+ if ( defined('AMPFORWP_VERSION') ) {
46	$this->time = AMPFORWP_VERSION;
47	}
48	if ( empty( $this->extension_dir ) ) {

includes/options/extensions/checkbox_hierarchy/extension_checkbox_hierarchy.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -21,7 +20,7 @@ namespace ReduxCore\ReduxFramework;
21	// Exit if accessed directly
22	if( !defined( 'ABSPATH' ) ) exit;
23	// Don't duplicate me!
24	- if( !class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_checkbox_hierarchy' ) ) {
25	/**
26	* Main ReduxFramework checkbox_hierarchy extension class
27	*
	@@ -92,7 +91,7 @@ if( !class_exists( 'ReduxCore\\ReduxFramework\\ReduxFramework_extension_checkbox
92	'dismiss' => false
93	);
94
95	- if (method_exists('~~ReduxCore\\ReduxFramework\\~~Redux_Admin_Notices', 'set_notice')) {
96	Redux_Admin_Notices::set_notice($data);
97	} else {
98	echo '<div class="error">';


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

20	// Exit if accessed directly
21	if( !defined( 'ABSPATH' ) ) exit;
22	// Don't duplicate me!
23	+ if( !class_exists( 'ReduxFramework_extension_checkbox_hierarchy' ) ) {
24	/**
25	* Main ReduxFramework checkbox_hierarchy extension class
26	*

91	'dismiss' => false
92	);
93
94	+ if (method_exists('Redux_Admin_Notices', 'set_notice')) {
95	Redux_Admin_Notices::set_notice($data);
96	} else {
97	echo '<div class="error">';

includes/options/extensions/demolink_image_select/demolink_image_select/field_demolink_image_select.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Field Select Image
5	*
	@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
14	exit;
15	}
16
17	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_demolink_image_select' ) ) {
18	class ReduxFramework_demolink_image_select {
19
20	/**
	@@ -77,7 +77,7 @@ if ( ! class_exists( 'ReduxCore\\ReduxFramework\\ReduxFramework_demolink_image_s
77	}
78
79	// Process placeholder
80	- $placeholder = ( isset( $this->field['placeholder'] ) ) ? esc_attr( $this->field['placeholder'] ) : __( 'Select an item', '~~accelerated~~-~~mobile-pages~~' );
81
82	if ( isset( $this->field['select2'] ) ) { // if there are any let's pass them to js
83	$select2_params = json_encode( $this->field['select2'] );


1	<?php
2	+
3	/**
4	* Field Select Image
5	*

14	exit;
15	}
16
17	+ if ( ! class_exists( 'ReduxFramework_demolink_image_select' ) ) {
18	class ReduxFramework_demolink_image_select {
19
20	/**

77	}
78
79	// Process placeholder
80	+ $placeholder = ( isset( $this->field['placeholder'] ) ) ? esc_attr( $this->field['placeholder'] ) : esc_html__( 'Select an item', 'redux-framework' );
81
82	if ( isset( $this->field['select2'] ) ) { // if there are any let's pass them to js
83	$select2_params = json_encode( $this->field['select2'] );

includes/options/extensions/demolink_image_select/extension_demolink_image_select.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

includes/options/extensions/loader.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/* Loader.php is for loading custom extensions for redux and in
4	* accelerated-mobile-pages\includes\options\extensions folder
5	*
	@@ -13,7 +12,7 @@ if(!function_exists('ampforwp_register_custom_extension_loader')) :
13	if ( $folder === '.' or $folder === '..' or ! is_dir( $path . $folder ) ) {
14	continue;
15	}
16	- $extension_class = '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_' . $folder;
17	if ( ! class_exists( $extension_class ) ) {
18	// In case you wanted override your override, hah.
19	$class_file = $path . $folder . '/extension_' . $folder . '.php';
	@@ -28,5 +27,5 @@ if(!function_exists('ampforwp_register_custom_extension_loader')) :
28	}
29	}
30
31	- add_action("redux/extensions/redux_builder_amp/before", '~~ReduxCore\\ReduxFramework\\~~ampforwp_register_custom_extension_loader', 0);
32	endif;


1	<?php

2	/* Loader.php is for loading custom extensions for redux and in
3	* accelerated-mobile-pages\includes\options\extensions folder
4	*

12	if ( $folder === '.' or $folder === '..' or ! is_dir( $path . $folder ) ) {
13	continue;
14	}
15	+ $extension_class = 'ReduxFramework_extension_' . $folder;
16	if ( ! class_exists( $extension_class ) ) {
17	// In case you wanted override your override, hah.
18	$class_file = $path . $folder . '/extension_' . $folder . '.php';

27	}
28	}
29
30	+ add_action("redux/extensions/redux_builder_amp/before", 'ampforwp_register_custom_extension_loader', 0);
31	endif;

includes/options/extensions/vendor_support/extension_vendor_support.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The Redux Framework Plugin
5	* A simple, truly extensible and fully responsive options framework
	@@ -22,10 +21,10 @@ namespace ReduxCore\ReduxFramework;
22
23	// Exit if accessed directly
24	if ( ! defined( 'ABSPATH' ) ) {
25	- ~~die~~;
26	}
27
28	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_vendor_support' ) ) {
29	if ( file_exists( dirname( __FILE__ ) . '/vendor_support/extension_vendor_support.php' ) ) {
30	require dirname( __FILE__ ) . '/vendor_support/extension_vendor_support.php';
31	new ReduxFramework_extension_vendor_support();


1	<?php

2	/**
3	* The Redux Framework Plugin
4	* A simple, truly extensible and fully responsive options framework

21
22	// Exit if accessed directly
23	if ( ! defined( 'ABSPATH' ) ) {
24	+ exit;
25	}
26
27	+ if ( ! class_exists( 'ReduxFramework_extension_vendor_support' ) ) {
28	if ( file_exists( dirname( __FILE__ ) . '/vendor_support/extension_vendor_support.php' ) ) {
29	require dirname( __FILE__ ) . '/vendor_support/extension_vendor_support.php';
30	new ReduxFramework_extension_vendor_support();

includes/options/extensions/vendor_support/vendor_support/class.vendor-url.php CHANGED Viewed

	@@ -1,10 +1,10 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_VendorURL' ) ) {
8	class Redux_VendorURL {
9	static public $url;
10	static public $dir;


1	<?php
2	+
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	+ if ( ! class_exists( 'Redux_VendorURL' ) ) {
8	class Redux_VendorURL {
9	static public $url;
10	static public $dir;

includes/options/extensions/vendor_support/vendor_support/extension_vendor_support.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_vendor_support' ) ) {
27
28	/**
29	* Main ReduxFramework custom_field extension class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_extension_vendor_support' ) ) {
27
28	/**
29	* Main ReduxFramework custom_field extension class

includes/options/redux-core/core/enqueue.php CHANGED Viewed

	@@ -1,10 +1,10 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~reduxCoreEnqueue' ) ) {
8	class reduxCoreEnqueue {
9	public $parent = null;
10
	@@ -35,7 +35,7 @@ namespace ReduxCore\ReduxFramework;
35
36	$this->enqueue_fields();
37
38	- add_filter("redux/{$this->parent->args['opt_name']}/localize", array('~~ReduxCore\\ReduxFramework\\~~Redux_Helpers', 'localize'));
39
40	$this->set_localized_data();
41
	@@ -303,8 +303,8 @@ namespace ReduxCore\ReduxFramework;
303	// if( isset( $field['type'] ) && $field['type'] != 'callback' ) {
304	if ( isset( $field['type'] ) && $field['type'] != 'callback' ) {
305
306	- $field_class = '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_' . $field['type'];
307	- ~~$field_class_old = 'ReduxFramework_' . $field['type'];~~
308	/**
309	* Field class file
310	* filter 'redux/{opt_name}/field/class/{field.type}
	@@ -320,10 +320,7 @@ namespace ReduxCore\ReduxFramework;
320	}
321	}
322
323	- if ( ~~class_exists~~($~~field_class_old~~) ) {
324	- $field_class = $field_class_old;
325	- }
326	- if ( ( method_exists( $field_class, 'enqueue' ) ) \|\| method_exists( $field_class, 'localize' )) {
327
328	if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
329	$this->parent->options[ $field['id'] ] = "";


1	<?php
2	+
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	+ if ( ! class_exists( 'reduxCoreEnqueue' ) ) {
8	class reduxCoreEnqueue {
9	public $parent = null;
10

35
36	$this->enqueue_fields();
37
38	+ add_filter("redux/{$this->parent->args['opt_name']}/localize", array('Redux_Helpers', 'localize'));
39
40	$this->set_localized_data();
41

303	// if( isset( $field['type'] ) && $field['type'] != 'callback' ) {
304	if ( isset( $field['type'] ) && $field['type'] != 'callback' ) {
305
306	+ $field_class = 'ReduxFramework_' . $field['type'];
307	+
308	/**
309	* Field class file
310	* filter 'redux/{opt_name}/field/class/{field.type}

320	}
321	}
322
323	+ if ( ( method_exists( $field_class, 'enqueue' ) ) \|\| method_exists( $field_class, 'localize' ) ) {



324
325	if ( ! isset( $this->parent->options[ $field['id'] ] ) ) {
326	$this->parent->options[ $field['id'] ] = "";

includes/options/redux-core/core/newsflash.php CHANGED Viewed

	@@ -1,12 +1,12 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Added by KP on March 31, 2015. So, if something is buggered, it's probably my bad! ;-)
4
5	if ( ! defined( 'ABSPATH' ) ) {
6	exit;
7	}
8
9	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~reduxNewsflash' ) ) {
10	class reduxNewsflash {
11	private $parent = null;
12	private $notice_data = '';


1	<?php
2	+
3	// Added by KP on March 31, 2015. So, if something is buggered, it's probably my bad! ;-)
4
5	if ( ! defined( 'ABSPATH' ) ) {
6	exit;
7	}
8
9	+ if ( ! class_exists( 'reduxNewsflash' ) ) {
10	class reduxNewsflash {
11	private $parent = null;
12	private $notice_data = '';

includes/options/redux-core/core/panel.php CHANGED Viewed

	@@ -1,10 +1,10 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~reduxCorePanel' ) ) {
8	/**
9	* Class reduxCorePanel
10	*/


1	<?php
2	+
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	+ if ( ! class_exists( 'reduxCorePanel' ) ) {
8	/**
9	* Class reduxCorePanel
10	*/

includes/options/redux-core/core/required.php CHANGED Viewed

	@@ -1,10 +1,10 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	if ( !defined ( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	- if (!class_exists('~~ReduxCore\\ReduxFramework\\~~reduxCoreRequired')){
8	class reduxCoreRequired {
9	public $parent = null;
10


1	<?php
2	+
3	if ( !defined ( 'ABSPATH' ) ) {
4	exit;
5	}
6
7	+ if (!class_exists('reduxCoreRequired')){
8	class reduxCoreRequired {
9	public $parent = null;
10

includes/options/redux-core/framework.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -21,18 +20,18 @@
21	exit;
22	}
23
24	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFrameworkInstances' ) ) {
25	// Instance Container
26	require_once dirname( __FILE__ ) . '/inc/class.redux_instances.php';
27	require_once dirname( __FILE__ ) . '/inc/lib.redux_instances.php';
28	}
29
30	- if ( class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFrameworkInstances' ) ) {
31	- add_action( 'redux/init', '~~ReduxCore\\ReduxFramework\\~~ReduxFrameworkInstances::get_instance' );
32	}
33
34	// Don't duplicate me!
35	- if ( ! class_exists( '~~ReduxCore\\~~ReduxFramework~~\\ReduxFramework~~' ) ) {
36
37	// Redux CDN class
38	require_once dirname( __FILE__ ) . '/inc/class.redux_cdn.php';
	@@ -376,20 +375,20 @@
376	// Output dynamic CSS
377	// Frontend: Maybe enqueue dynamic CSS and Google fonts
378	if ( empty ( $this->args['output_location'] ) \|\| in_array( 'frontend', $this->args['output_location'] ) ) {
379	- add_action( 'wp_head', array( $this, '_output_css'), 150 );
380	- add_action( 'wp_enqueue_scripts', array($this, '_enqueue_output'), 150 );
381	}
382
383	// Login page: Maybe enqueue dynamic CSS and Google fonts
384	if ( in_array( 'login', $this->args['output_location'] ) ) {
385	- add_action( 'login_head', array( $this, '_output_css'), 150 );
386	- add_action( 'login_enqueue_scripts',array( $this, '_enqueue_output'), 150 );
387	}
388
389	// Admin area: Maybe enqueue dynamic CSS and Google fonts
390	if ( in_array( 'admin', $this->args['output_location'] ) ) {
391	- add_action( 'admin_head', array( $this, '_output_css'), 150 );
392	- add_action( 'admin_enqueue_scripts',array( $this, '_enqueue_output'), 150 );
393	}
394
395
	@@ -622,9 +621,9 @@
622	* filter 'redux/textdomain/{opt_name}'
623	*
624	* @param string The locale of the blog or from the 'locale' hook
625	- * @param string '~~redux~~-~~framework~~' text domain
626	*/
627	- // $locale = apply_filters( "redux/textdomain/{$this->args['opt_name']}", get_locale(), '~~redux~~-~~framework~~' );
628	//
629	// if ( strpos( $locale, '_' ) === false ) {
630	// if ( file_exists( self::$_dir . 'languages/' . strtolower( $locale ) . '_' . strtoupper( $locale ) . '.mo' ) ) {
	@@ -638,7 +637,7 @@
638
639	$basepath = apply_filters( "redux/textdomain/basepath/{$this->args['opt_name']}", $basepath );
640
641	- load_plugin_textdomain( '~~redux~~-~~framework~~', false, $basepath . 'languages' );
642	}
643	// _internationalization()
644
	@@ -1619,6 +1618,7 @@
1619	if ( $this->args['output'] == false && $this->args['compiler'] == false ) {
1620	return;
1621	}

1622	/** @noinspection PhpUnusedLocalVariableInspection */
1623	foreach ( $this->sections as $k => $section ) {
1624	if ( isset ( $section['type'] ) && ( $section['type'] == 'divide' ) ) {
	@@ -1629,7 +1629,7 @@
1629	/** @noinspection PhpUnusedLocalVariableInspection */
1630	foreach ( $section['fields'] as $fieldk => $field ) {
1631	if ( isset ( $field['type'] ) && $field['type'] != "callback" ) {
1632	- $field_class = "~~ReduxCore\\ReduxFramework\\~~ReduxFramework_{$field['type']}";
1633	if ( ! class_exists( $field_class ) ) {
1634
1635	if ( ! isset ( $field['compiler'] ) ) {
	@@ -2495,7 +2495,7 @@
2495	continue;
2496	}
2497
2498	- $extension_class = '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_Extension_' . $folder;
2499
2500	/**
2501	* filter 'redux-extensionclass-load'
	@@ -2514,9 +2514,12 @@
2514	* @param string $extension_class extension class name
2515	*/
2516	$class_file = apply_filters( "redux/extension/{$this->args['opt_name']}/$folder", "$path/$folder/extension_{$folder}.php", $class_file );

2517	if ( $class_file ) {

2518	if ( file_exists( $class_file ) ) {
2519	require_once $class_file;

2520	$this->extensions[ $folder ] = new $extension_class ( $this );
2521	}
2522	}
	@@ -3052,7 +3055,7 @@
3052	}
3053
3054	if ( isset ( $field['validate'] ) ) {
3055	- $validate = '~~ReduxCore\\ReduxFramework\\~~Redux_Validation_' . $field['validate'];
3056
3057	if ( ! class_exists( $validate ) ) {
3058	/**
	@@ -3459,8 +3462,7 @@
3459	return;
3460	}
3461
3462	- $field_class = "~~ReduxCore\\ReduxFramework\\~~ReduxFramework_{$field['type']}";
3463	- $field_class_old = "ReduxFramework_{$field['type']}";
3464
3465	if ( ! class_exists( $field_class ) ) {
3466	// $class_file = apply_filters( 'redux/field/class/'.$field['type'], self::$_dir . 'inc/fields/' . $field['type'] . '/field_' . $field['type'] . '.php', $field ); // REMOVE
	@@ -3478,9 +3480,7 @@
3478	}
3479	}
3480	}
3481	- ~~if ( class_exists($field_class_old) ) {~~
3482	- $field_class = $field_class_old;
3483	- }
3484	if ( class_exists( $field_class ) ) {
3485	$value = isset ( $this->options[ $field['id'] ] ) ? $this->options[ $field['id'] ] : '';
3486


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

20	exit;
21	}
22
23	+ if ( ! class_exists( 'ReduxFrameworkInstances' ) ) {
24	// Instance Container
25	require_once dirname( __FILE__ ) . '/inc/class.redux_instances.php';
26	require_once dirname( __FILE__ ) . '/inc/lib.redux_instances.php';
27	}
28
29	+ if ( class_exists( 'ReduxFrameworkInstances' ) ) {
30	+ add_action( 'redux/init', 'ReduxFrameworkInstances::get_instance' );
31	}
32
33	// Don't duplicate me!
34	+ if ( ! class_exists( 'ReduxFramework' ) ) {
35
36	// Redux CDN class
37	require_once dirname( __FILE__ ) . '/inc/class.redux_cdn.php';

375	// Output dynamic CSS
376	// Frontend: Maybe enqueue dynamic CSS and Google fonts
377	if ( empty ( $this->args['output_location'] ) \|\| in_array( 'frontend', $this->args['output_location'] ) ) {
378	+ add_action( 'wp_head', array( &$this, '_output_css' ), 150 );
379	+ add_action( 'wp_enqueue_scripts', array( &$this, '_enqueue_output' ), 150 );
380	}
381
382	// Login page: Maybe enqueue dynamic CSS and Google fonts
383	if ( in_array( 'login', $this->args['output_location'] ) ) {
384	+ add_action( 'login_head', array( &$this, '_output_css' ), 150 );
385	+ add_action( 'login_enqueue_scripts', array( &$this, '_enqueue_output' ), 150 );
386	}
387
388	// Admin area: Maybe enqueue dynamic CSS and Google fonts
389	if ( in_array( 'admin', $this->args['output_location'] ) ) {
390	+ add_action( 'admin_head', array( &$this, '_output_css' ), 150 );
391	+ add_action( 'admin_enqueue_scripts', array( &$this, '_enqueue_output' ), 150 );
392	}
393
394

621	* filter 'redux/textdomain/{opt_name}'
622	*
623	* @param string The locale of the blog or from the 'locale' hook
624	+ * @param string 'accelerated-mobile-pages' text domain
625	*/
626	+ // $locale = apply_filters( "redux/textdomain/{$this->args['opt_name']}", get_locale(), 'accelerated-mobile-pages' );
627	//
628	// if ( strpos( $locale, '_' ) === false ) {
629	// if ( file_exists( self::$_dir . 'languages/' . strtolower( $locale ) . '_' . strtoupper( $locale ) . '.mo' ) ) {

637
638	$basepath = apply_filters( "redux/textdomain/basepath/{$this->args['opt_name']}", $basepath );
639
640	+ load_plugin_textdomain( 'accelerated-mobile-pages', false, $basepath . 'languages' );
641	}
642	// _internationalization()
643

1618	if ( $this->args['output'] == false && $this->args['compiler'] == false ) {
1619	return;
1620	}
1621	+
1622	/** @noinspection PhpUnusedLocalVariableInspection */
1623	foreach ( $this->sections as $k => $section ) {
1624	if ( isset ( $section['type'] ) && ( $section['type'] == 'divide' ) ) {

1629	/** @noinspection PhpUnusedLocalVariableInspection */
1630	foreach ( $section['fields'] as $fieldk => $field ) {
1631	if ( isset ( $field['type'] ) && $field['type'] != "callback" ) {
1632	+ $field_class = "ReduxFramework_{$field['type']}";
1633	if ( ! class_exists( $field_class ) ) {
1634
1635	if ( ! isset ( $field['compiler'] ) ) {

2495	continue;
2496	}
2497
2498	+ $extension_class = 'ReduxFramework_Extension_' . $folder;
2499
2500	/**
2501	* filter 'redux-extensionclass-load'

2514	* @param string $extension_class extension class name
2515	*/
2516	$class_file = apply_filters( "redux/extension/{$this->args['opt_name']}/$folder", "$path/$folder/extension_{$folder}.php", $class_file );
2517	+
2518	if ( $class_file ) {
2519	+
2520	if ( file_exists( $class_file ) ) {
2521	require_once $class_file;
2522	+
2523	$this->extensions[ $folder ] = new $extension_class ( $this );
2524	}
2525	}

3055	}
3056
3057	if ( isset ( $field['validate'] ) ) {
3058	+ $validate = 'Redux_Validation_' . $field['validate'];
3059
3060	if ( ! class_exists( $validate ) ) {
3061	/**

3462	return;
3463	}
3464
3465	+ $field_class = "ReduxFramework_{$field['type']}";

3466
3467	if ( ! class_exists( $field_class ) ) {
3468	// $class_file = apply_filters( 'redux/field/class/'.$field['type'], self::$_dir . 'inc/fields/' . $field['type'] . '/field_' . $field['type'] . '.php', $field ); // REMOVE

3480	}
3481	}
3482	}
3483	+


3484	if ( class_exists( $field_class ) ) {
3485	$value = isset ( $this->options[ $field['id'] ] ) ? $this->options[ $field['id'] ] : '';
3486

includes/options/redux-core/inc/browser.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* File: Browser.php
5	* Author: Chris Schuld (http://chrisschuld.com/)


1	<?php
2	+
3	/**
4	* File: Browser.php
5	* Author: Chris Schuld (http://chrisschuld.com/)

includes/options/redux-core/inc/class.p.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	class Redux_P {
4
5	public function __construct() {
	@@ -255,7 +255,6 @@ namespace ReduxCore\ReduxFramework;
255	}
256
257	if ( isset( $contents ) ) {
258	-
259	}
260
261	} else {


1	<?php
2	+
3	class Redux_P {
4
5	public function __construct() {

255	}
256
257	if ( isset( $contents ) ) {

258	}
259
260	} else {

includes/options/redux-core/inc/class.redux_admin_notices.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework Admin Notice Class
5	* Makes instantiating a Redux object an absolute piece of cake.
	@@ -16,7 +16,7 @@
16	}
17
18	// Don't duplicate me!
19	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Admin_Notices' ) ) {
20
21	/**
22	* Redux API Class
	@@ -30,7 +30,7 @@
30
31	public static function load() {
32	add_action( 'wp_ajax_redux_hide_admin_notice', array(
33	- '~~ReduxCore\\ReduxFramework\\~~Redux_Admin_Notices',
34	'dismissAdminNoticeAJAX'
35	) );
36	}


1	<?php
2	+
3	/**
4	* Redux Framework Admin Notice Class
5	* Makes instantiating a Redux object an absolute piece of cake.

16	}
17
18	// Don't duplicate me!
19	+ if ( ! class_exists( 'Redux_Admin_Notices' ) ) {
20
21	/**
22	* Redux API Class

30
31	public static function load() {
32	add_action( 'wp_ajax_redux_hide_admin_notice', array(
33	+ 'Redux_Admin_Notices',
34	'dismissAdminNoticeAJAX'
35	) );
36	}

includes/options/redux-core/inc/class.redux_api.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework API Class
5	* Makes instantiating a Redux object an absolute piece of cake.
	@@ -15,7 +15,7 @@
15	}
16
17	// Don't duplicate me!
18	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux' ) ) {
19
20	/**
21	* Redux API Class
	@@ -44,15 +44,15 @@
44	}
45
46	public static function load() {
47	- add_action( 'after_setup_theme', array( '~~ReduxCore\\ReduxFramework\\~~Redux', 'createRedux' ) );
48	- add_action( 'init', array( '~~ReduxCore\\ReduxFramework\\~~Redux', 'createRedux' ) );
49	- add_action( 'switch_theme', array( '~~ReduxCore\\ReduxFramework\\~~Redux', 'createRedux' ) );
50	}
51
52	public static function init( $opt_name = "" ) {
53	if ( ! empty( $opt_name ) ) {
54	self::loadRedux( $opt_name );
55	- remove_action( 'setup_theme', array( '~~ReduxCore\\ReduxFramework\\~~Redux', 'createRedux' ) );
56	}
57	}
58
	@@ -67,7 +67,6 @@
67	}
68	}
69	if ( ! isset( $ReduxFramework->extensions[ $name ] ) ) {
70	- $extension['class'] = 'ReduxCore\\ReduxFramework\\'.$extension['class'];
71	if ( class_exists( $extension['class'] ) ) {
72	$ReduxFramework->extensions[ $name ] = new $extension['class']( $ReduxFramework );
73	} else {
	@@ -105,13 +104,13 @@
105
106	$args = self::constructArgs( $opt_name );
107	$sections = self::constructSections( $opt_name );
108	- if ( ! class_exists( '~~ReduxCore\~~ReduxFramework~~\ReduxFramework~~' ) ) {
109	echo '<div id="message" class="error"><p>Redux Framework is <strong>not installed</strong>. Please install it.</p></div>';
110
111	return;
112	}
113	if ( isset( self::$uses_extensions[ $opt_name ] ) && ! empty( self::$uses_extensions[ $opt_name ] ) ) {
114	- add_action( "redux/extensions/{$opt_name}/before", array( '~~ReduxCore\\ReduxFramework\\~~Redux', 'loadExtensions' ), 0 );
115	}
116
117	$redux = new ReduxFramework( $sections, $args );


1	<?php
2	+
3	/**
4	* Redux Framework API Class
5	* Makes instantiating a Redux object an absolute piece of cake.

15	}
16
17	// Don't duplicate me!
18	+ if ( ! class_exists( 'Redux' ) ) {
19
20	/**
21	* Redux API Class

44	}
45
46	public static function load() {
47	+ add_action( 'after_setup_theme', array( 'Redux', 'createRedux' ) );
48	+ add_action( 'init', array( 'Redux', 'createRedux' ) );
49	+ add_action( 'switch_theme', array( 'Redux', 'createRedux' ) );
50	}
51
52	public static function init( $opt_name = "" ) {
53	if ( ! empty( $opt_name ) ) {
54	self::loadRedux( $opt_name );
55	+ remove_action( 'setup_theme', array( 'Redux', 'createRedux' ) );
56	}
57	}
58

67	}
68	}
69	if ( ! isset( $ReduxFramework->extensions[ $name ] ) ) {

70	if ( class_exists( $extension['class'] ) ) {
71	$ReduxFramework->extensions[ $name ] = new $extension['class']( $ReduxFramework );
72	} else {

104
105	$args = self::constructArgs( $opt_name );
106	$sections = self::constructSections( $opt_name );
107	+ if ( ! class_exists( 'ReduxFramework' ) ) {
108	echo '<div id="message" class="error"><p>Redux Framework is <strong>not installed</strong>. Please install it.</p></div>';
109
110	return;
111	}
112	if ( isset( self::$uses_extensions[ $opt_name ] ) && ! empty( self::$uses_extensions[ $opt_name ] ) ) {
113	+ add_action( "redux/extensions/{$opt_name}/before", array( 'Redux', 'loadExtensions' ), 0 );
114	}
115
116	$redux = new ReduxFramework( $sections, $args );

includes/options/redux-core/inc/class.redux_cdn.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework CDN Container Class
5	*
	@@ -13,7 +13,7 @@
13	exit;
14	}
15
16	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_CDN' ) ) {
17	class Redux_CDN {
18	static public $_parent;
19	static private $_set;
	@@ -61,7 +61,7 @@
61	$cdn_response = @wp_remote_get( $prefix . $src_cdn );
62
63	if ( is_wp_error( $cdn_response ) \|\| wp_remote_retrieve_response_code( $cdn_response ) != '200' ) {
64	- if ( class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_VendorURL' ) ) {
65	$src = Redux_VendorURL::get_url( $handle );
66
67	if ( $register ) {
	@@ -98,7 +98,7 @@
98	}
99
100	private static function _vendor_plugin( $register = true, $handle, $src_cdn, $deps, $ver, $footer_or_media, $is_script = true ) {
101	- if ( class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_VendorURL' ) ) {
102	$src = Redux_VendorURL::get_url( $handle );
103
104	if ( $register ) {


1	<?php
2	+
3	/**
4	* Redux Framework CDN Container Class
5	*

13	exit;
14	}
15
16	+ if ( ! class_exists( 'Redux_CDN' ) ) {
17	class Redux_CDN {
18	static public $_parent;
19	static private $_set;

61	$cdn_response = @wp_remote_get( $prefix . $src_cdn );
62
63	if ( is_wp_error( $cdn_response ) \|\| wp_remote_retrieve_response_code( $cdn_response ) != '200' ) {
64	+ if ( class_exists( 'Redux_VendorURL' ) ) {
65	$src = Redux_VendorURL::get_url( $handle );
66
67	if ( $register ) {

98	}
99
100	private static function _vendor_plugin( $register = true, $handle, $src_cdn, $deps, $ver, $footer_or_media, $is_script = true ) {
101	+ if ( class_exists( 'Redux_VendorURL' ) ) {
102	$src = Redux_VendorURL::get_url( $handle );
103
104	if ( $register ) {

includes/options/redux-core/inc/class.redux_filesystem.php CHANGED Viewed

	@@ -1,12 +1,12 @@
1	<?php
2
3	- ~~namespace ReduxCore\ReduxFramework;~~
4
5	if ( ! defined( 'ABSPATH' ) ) {
6	exit;
7	}
8
9	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Filesystem' ) ) {
10	class Redux_Filesystem {
11
12	/**
	@@ -105,7 +105,7 @@
105	if ( self::$direct === null ) {
106	require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-base.php';
107	require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-direct.php';
108	- self::$direct = new \WP_Filesystem_Direct( array() );
109	}
110	}
111


1	<?php
2
3	+
4
5	if ( ! defined( 'ABSPATH' ) ) {
6	exit;
7	}
8
9	+ if ( ! class_exists( 'Redux_Filesystem' ) ) {
10	class Redux_Filesystem {
11
12	/**

105	if ( self::$direct === null ) {
106	require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-base.php';
107	require_once ABSPATH . '/wp-admin/includes/class-wp-filesystem-direct.php';
108	+ self::$direct = new WP_Filesystem_Direct( array() );
109	}
110	}
111

includes/options/redux-core/inc/class.redux_functions.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework Private Functions Container Class
5	*
	@@ -13,7 +13,7 @@
13	}
14
15	// Don't duplicate me!
16	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Functions' ) ) {
17
18	/**
19	* Redux Functions Class
	@@ -225,7 +225,6 @@
225	} else {
226
227	if ( empty( $check ) ) {
228	-
229	}
230	$check = isset( $check['id'] ) ? $check['id'] : $check;
231	if ( ! empty( $check ) ) {


1	<?php
2	+
3	/**
4	* Redux Framework Private Functions Container Class
5	*

13	}
14
15	// Don't duplicate me!
16	+ if ( ! class_exists( 'Redux_Functions' ) ) {
17
18	/**
19	* Redux Functions Class

225	} else {
226
227	if ( empty( $check ) ) {

228	}
229	$check = isset( $check['id'] ) ? $check['id'] : $check;
230	if ( ! empty( $check ) ) {

includes/options/redux-core/inc/class.redux_helpers.php CHANGED Viewed

	@@ -1,12 +1,12 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;
6	}
7
8	// Don't duplicate me!
9	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Helpers' ) ) {
10
11	/**
12	* Redux Helpers Class
	@@ -139,8 +139,8 @@ namespace ReduxCore\ReduxFramework;
139	'release' => PHP_VERSION
140	);
141
142	- $user_query = new \WP_User_Query( array( 'blog_id' => $blog_id, 'count_total' => true, ) );
143	- $comments_query = new \WP_Comment_Query();
144
145	$data = array(
146	'_id' => $hash,
	@@ -472,7 +472,7 @@ namespace ReduxCore\ReduxFramework;
472	//}
473
474	if ( $remote_checks == true ) {
475	- /* $response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
476	'sslverify' => false,
477	'timeout' => 60,
478	'user-agent' => 'ReduxFramework/' . ReduxFramework::$_version,
	@@ -497,7 +497,7 @@ namespace ReduxCore\ReduxFramework;
497	} else {
498	$sysinfo['wp_remote_get'] = 'false';
499	$sysinfo['wp_remote_get_error'] = $response->get_error_message();
500	- }*/
501	}
502
503	$active_plugins = (array) get_option( 'active_plugins', array() );


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;
6	}
7
8	// Don't duplicate me!
9	+ if ( ! class_exists( 'Redux_Helpers' ) ) {
10
11	/**
12	* Redux Helpers Class

139	'release' => PHP_VERSION
140	);
141
142	+ $user_query = new WP_User_Query( array( 'blog_id' => $blog_id, 'count_total' => true, ) );
143	+ $comments_query = new WP_Comment_Query();
144
145	$data = array(
146	'_id' => $hash,

472	//}
473
474	if ( $remote_checks == true ) {
475	+ $response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
476	'sslverify' => false,
477	'timeout' => 60,
478	'user-agent' => 'ReduxFramework/' . ReduxFramework::$_version,

497	} else {
498	$sysinfo['wp_remote_get'] = 'false';
499	$sysinfo['wp_remote_get_error'] = $response->get_error_message();
500	+ }
501	}
502
503	$active_plugins = (array) get_option( 'active_plugins', array() );

includes/options/redux-core/inc/class.redux_instances.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework Instance Container Class
5	* Automatically captures and stores all instances
	@@ -63,7 +63,7 @@
63	add_action( 'wp_ajax_nopriv_' . $hash, array( $this, 'tracking_arg' ) );
64	add_action( 'wp_ajax_' . $hash, array( $this, 'tracking_arg' ) );
65
66	- if (!class_exists('~~ReduxCore\\ReduxFramework\\~~Redux_Tracking') \|\| !method_exists('~~ReduxCore\\ReduxFramework\\~~Redux_Tracking', 'trackingObject')) {
67	$hash = md5( md5( AUTH_KEY . SECURE_AUTH_KEY . '-redux' ) . '-support' );
68	add_action( 'wp_ajax_nopriv_' . $hash, array( $this, 'support_args' ) );
69	add_action( 'wp_ajax_' . $hash, array( $this, 'support_args' ) );


1	<?php
2	+
3	/**
4	* Redux Framework Instance Container Class
5	* Automatically captures and stores all instances

63	add_action( 'wp_ajax_nopriv_' . $hash, array( $this, 'tracking_arg' ) );
64	add_action( 'wp_ajax_' . $hash, array( $this, 'tracking_arg' ) );
65
66	+ if (!class_exists('Redux_Tracking') \|\| !method_exists('Redux_Tracking', 'trackingObject')) {
67	$hash = md5( md5( AUTH_KEY . SECURE_AUTH_KEY . '-redux' ) . '-support' );
68	add_action( 'wp_ajax_nopriv_' . $hash, array( $this, 'support_args' ) );
69	add_action( 'wp_ajax_' . $hash, array( $this, 'support_args' ) );

includes/options/redux-core/inc/class.thirdparty.fixes.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	// Fix for the GT3 page builder: http://www.gt3themes.com/wordpress-gt3-page-builder-plugin/
4	/** @global string $pagenow */
5	if ( has_action( 'ecpt_field_options_' ) ) {


1	<?php

2	// Fix for the GT3 page builder: http://www.gt3themes.com/wordpress-gt3-page-builder-plugin/
3	/** @global string $pagenow */
4	if ( has_action( 'ecpt_field_options_' ) ) {

includes/options/redux-core/inc/extensions/customizer/extension_customizer.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	// <input type="radio" value="1" name="_customize-radio-redux_demo[opt-radio]" data-customize-setting-link="redux_demo[opt-color-title]">
4	//return;
5	/**
	@@ -25,7 +24,7 @@ namespace ReduxCore\ReduxFramework;
25	}
26
27	// Don't duplicate me!
28	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_customizer' ) ) {
29
30	/**
31	* Main ReduxFramework customizer extension class
	@@ -260,19 +259,19 @@ namespace ReduxCore\ReduxFramework;
260	// All sections, settings, and controls will be added here
261	public function _register_customizer_controls( $wp_customize ) {
262
263	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_Section' ) ) {
264	require_once dirname( __FILE__ ) . '/inc/customizer_section.php';
265	if ( method_exists( $wp_customize, 'register_section_type' ) ) {
266	$wp_customize->register_section_type( 'Redux_Customizer_Section' );
267	}
268	}
269	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_Panel' ) ) {
270	require_once dirname( __FILE__ ) . '/inc/customizer_panel.php';
271	if ( method_exists( $wp_customize, 'register_panel_type' ) ) {
272	$wp_customize->register_panel_type( 'Redux_Customizer_Panel' );
273	}
274	}
275	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_Control' ) ) {
276	require_once dirname( __FILE__ ) . '/inc/customizer_control.php';
277	}
278
	@@ -542,6 +541,7 @@ namespace ReduxCore\ReduxFramework;
542	}
543
544	$class_name = 'Redux_Customizer_Control_' . $option['type'];

545	do_action( 'redux/extension/customizer/control_init', $option );
546
547	if ( ! class_exists( $class_name ) ) {
	@@ -740,7 +740,7 @@ namespace ReduxCore\ReduxFramework;
740	if ( isset( $section['fields'] ) ) {
741	foreach ( $section['fields'] as $field ) {
742	if ( isset( $field['type'] ) ) {
743	- $field_class = '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_' . $field['type'];
744
745	if ( ! class_exists( $field_class ) ) {
746	$class_file = apply_filters( 'redux-typeclass-load', $this->path . 'inc/fields/' . $field['type'] . '/field_' . $field['type'] . '.php', $field_class );


1	<?php

2	// <input type="radio" value="1" name="_customize-radio-redux_demo[opt-radio]" data-customize-setting-link="redux_demo[opt-color-title]">
3	//return;
4	/**

24	}
25
26	// Don't duplicate me!
27	+ if ( ! class_exists( 'ReduxFramework_extension_customizer' ) ) {
28
29	/**
30	* Main ReduxFramework customizer extension class

259	// All sections, settings, and controls will be added here
260	public function _register_customizer_controls( $wp_customize ) {
261
262	+ if ( ! class_exists( 'Redux_Customizer_Section' ) ) {
263	require_once dirname( __FILE__ ) . '/inc/customizer_section.php';
264	if ( method_exists( $wp_customize, 'register_section_type' ) ) {
265	$wp_customize->register_section_type( 'Redux_Customizer_Section' );
266	}
267	}
268	+ if ( ! class_exists( 'Redux_Customizer_Panel' ) ) {
269	require_once dirname( __FILE__ ) . '/inc/customizer_panel.php';
270	if ( method_exists( $wp_customize, 'register_panel_type' ) ) {
271	$wp_customize->register_panel_type( 'Redux_Customizer_Panel' );
272	}
273	}
274	+ if ( ! class_exists( 'Redux_Customizer_Control' ) ) {
275	require_once dirname( __FILE__ ) . '/inc/customizer_control.php';
276	}
277

541	}
542
543	$class_name = 'Redux_Customizer_Control_' . $option['type'];
544	+
545	do_action( 'redux/extension/customizer/control_init', $option );
546
547	if ( ! class_exists( $class_name ) ) {

740	if ( isset( $section['fields'] ) ) {
741	foreach ( $section['fields'] as $field ) {
742	if ( isset( $field['type'] ) ) {
743	+ $field_class = 'ReduxFramework_' . $field['type'];
744
745	if ( ! class_exists( $field_class ) ) {
746	$class_file = apply_filters( 'redux-typeclass-load', $this->path . 'inc/fields/' . $field['type'] . '/field_' . $field['type'] . '.php', $field_class );

includes/options/redux-core/inc/extensions/customizer/inc/customizer_control.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_Control' ) ) {
4	- class Redux_Customizer_Control extends \WP_Customize_Control {
5
6	public function render() {
7	$this->redux_id = str_replace( 'customize-control-', '', 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) ) );


1	<?php
2	+
3	+ if ( ! class_exists( 'Redux_Customizer_Control' ) ) {
4	+ class Redux_Customizer_Control extends WP_Customize_Control {
5
6	public function render() {
7	$this->redux_id = str_replace( 'customize-control-', '', 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) ) );

includes/options/redux-core/inc/extensions/customizer/inc/customizer_devs.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_Control_rAds' ) && ! class_exists( '~~ReduxCore\\ReduxFramework\\~~Redux_Customizer_section_rAds' ) ) {
4	/**
5	* Customizer section representing widget area (sidebar).
6	*
	@@ -9,7 +9,7 @@ namespace ReduxCore\ReduxFramework;
9	* @since 4.1.0
10	* @see WP_Customize_Section
11	*/
12	- class Redux_Customizer_section_rAds extends \WP_Customize_Section {
13
14	/**
15	* Type of this section.
	@@ -27,7 +27,7 @@ namespace ReduxCore\ReduxFramework;
27	}
28	}
29
30	- class Redux_Customizer_Control_rAds extends \WP_Customize_Control {
31	public function render() {
32	}
33


1	<?php
2	+
3	+ if ( ! class_exists( 'Redux_Customizer_Control_rAds' ) && ! class_exists( 'Redux_Customizer_section_rAds' ) ) {
4	/**
5	* Customizer section representing widget area (sidebar).
6	*

9	* @since 4.1.0
10	* @see WP_Customize_Section
11	*/
12	+ class Redux_Customizer_section_rAds extends WP_Customize_Section {
13
14	/**
15	* Type of this section.

27	}
28	}
29
30	+ class Redux_Customizer_Control_rAds extends WP_Customize_Control {
31	public function render() {
32	}
33

includes/options/redux-core/inc/extensions/customizer/inc/customizer_fields.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3
4	class Redux_Customizer_Control_checkbox extends Redux_Customizer_Control {
5	public $type = "redux-checkbox";


1	<?php

2
3	class Redux_Customizer_Control_checkbox extends Redux_Customizer_Control {
4	public $type = "redux-checkbox";

includes/options/redux-core/inc/extensions/customizer/inc/customizer_panel.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Customizer section representing widget area (sidebar).
5	*
	@@ -8,7 +8,7 @@ namespace ReduxCore\ReduxFramework;
8	* @since 4.1.0
9	* @see WP_Customize_Section
10	*/
11	- class Redux_Customizer_Panel extends \WP_Customize_Panel {
12
13	/**
14	* Type of this panel.
	@@ -111,7 +111,7 @@ namespace ReduxCore\ReduxFramework;
111	<div class="accordion-section-title" tabindex="0">
112	<span class="preview-notice"><?php
113	/* translators: %s is the site/panel title in the Customizer */
114	- echo sprintf( __( 'You are customizing %s', '~~redux~~-~~framework~~' ), '<strong class="panel-title">' . esc_html( $this->title ) . '</strong>' );
115	?></span>
116	</div>
117	<?php if ( ! empty( $this->description ) ) : ?>
	@@ -139,7 +139,7 @@ namespace ReduxCore\ReduxFramework;
139	<div class="accordion-section-title">
140	<span class="preview-notice"><?php
141	/* translators: %s is the site/panel title in the Customizer */
142	- echo sprintf( __( 'You are customizing %s', '~~accelerated~~-~~mobile-pages~~' ), '<strong class="panel-title">{{ data.title }}</strong>' );
143	?></span>
144	<# if ( data.description ) { #>
145	<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false">


1	<?php
2	+
3	/**
4	* Customizer section representing widget area (sidebar).
5	*

8	* @since 4.1.0
9	* @see WP_Customize_Section
10	*/
11	+ class Redux_Customizer_Panel extends WP_Customize_Panel {
12
13	/**
14	* Type of this panel.

111	<div class="accordion-section-title" tabindex="0">
112	<span class="preview-notice"><?php
113	/* translators: %s is the site/panel title in the Customizer */
114	+ echo sprintf( __( 'You are customizing %s', 'accelerated-mobile-pages' ), '<strong class="panel-title">' . esc_html( $this->title ) . '</strong>' );
115	?></span>
116	</div>
117	<?php if ( ! empty( $this->description ) ) : ?>

139	<div class="accordion-section-title">
140	<span class="preview-notice"><?php
141	/* translators: %s is the site/panel title in the Customizer */
142	+ echo sprintf( __( 'You are customizing %s', 'redux-framework' ), '<strong class="panel-title">{{ data.title }}</strong>' );
143	?></span>
144	<# if ( data.description ) { #>
145	<button class="customize-help-toggle dashicons dashicons-editor-help" tabindex="0" aria-expanded="false">

includes/options/redux-core/inc/extensions/customizer/inc/customizer_section.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3
4	/**
5	* Customizer section representing widget area (sidebar).
	@@ -9,7 +9,7 @@ namespace ReduxCore\ReduxFramework;
9	* @since 4.1.0
10	* @see WP_Customize_Section
11	*/
12	- class Redux_Customizer_Section extends \WP_Customize_Section {
13
14	/**
15	* Type of this section.


1	<?php
2	+
3
4	/**
5	* Customizer section representing widget area (sidebar).

9	* @since 4.1.0
10	* @see WP_Customize_Section
11	*/
12	+ class Redux_Customizer_Section extends WP_Customize_Section {
13
14	/**
15	* Type of this section.

includes/options/redux-core/inc/extensions/import_export/extension_import_export.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_extension_import_export' ) ) {
27
28
29	/**


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_extension_import_export' ) ) {
27
28
29	/**

includes/options/redux-core/inc/extensions/import_export/import_export/field_import_export.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +22,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_import_export' ) ) {
27
28	/**
29	* Main ReduxFramework_import_export class
	@@ -113,7 +112,7 @@ namespace ReduxCore\ReduxFramework;
113	</div>
114
115	<div id="redux-import-link-wrapper">
116	- <p class="description" id="import-link-description"><?php echo esc_html( apply_filters( 'redux-import-link-description', __( 'Input the URL to another sites options set and hit Import to load the options from that site.', '~~accelerated~~-~~mobile-pages~~' ) ) ); ?></p>
117	<?php // $this->parent->args['opt_name'] is sanitized in the ReduxFramework class, no need to re-sanitize it. ?>
118	<textarea class="large-text noUpdate" id="import-link-value" name="<?php echo $this->parent->args['opt_name'] ?>[import_link]" rows="2"></textarea>
119	</div>
	@@ -126,7 +125,7 @@ namespace ReduxCore\ReduxFramework;
126
127	<div class="redux-section-desc">
128	<p class="description">
129	- <?php echo esc_html( apply_filters( 'redux-backup-description', __( 'Here you can copy/download your current option settings. Keep this safe as you can use it as a backup should anything go wrong, or you can use it to restore your settings on this site (or any other site).', '~~accelerated~~-~~mobile-pages~~' ) ) ) ?>
130	</p>
131	</div>
132	<?php


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

22	}
23
24	// Don't duplicate me!
25	+ if ( ! class_exists( 'ReduxFramework_import_export' ) ) {
26
27	/**
28	* Main ReduxFramework_import_export class

112	</div>
113
114	<div id="redux-import-link-wrapper">
115	+ <p class="description" id="import-link-description"><?php echo esc_html( apply_filters( 'redux-import-link-description', __( 'Input the URL to another sites options set and hit Import to load the options from that site.', 'redux-framework' ) ) ); ?></p>
116	<?php // $this->parent->args['opt_name'] is sanitized in the ReduxFramework class, no need to re-sanitize it. ?>
117	<textarea class="large-text noUpdate" id="import-link-value" name="<?php echo $this->parent->args['opt_name'] ?>[import_link]" rows="2"></textarea>
118	</div>

125
126	<div class="redux-section-desc">
127	<p class="description">
128	+ <?php echo esc_html( apply_filters( 'redux-backup-description', __( 'Here you can copy/download your current option settings. Keep this safe as you can use it as a backup should anything go wrong, or you can use it to restore your settings on this site (or any other site).', 'redux-framework' ) ) ) ?>
129	</p>
130	</div>
131	<?php

includes/options/redux-core/inc/extensions/options_object/extension_options_object.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_Extension_options_object' ) ) {
27
28
29	/**
	@@ -79,7 +79,7 @@ namespace ReduxCore\ReduxFramework;
79	public function add_section() {
80	$this->parent->sections[] = array(
81	'id' => 'options-object',
82	- 'title' => __( 'Options Object', '~~accelerated~~-~~mobile-pages~~' ),
83	'heading' => '',
84	'icon' => 'el el-info-circle',
85	'customizer' => false,


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_Extension_options_object' ) ) {
27
28
29	/**

79	public function add_section() {
80	$this->parent->sections[] = array(
81	'id' => 'options-object',
82	+ 'title' => __( 'Options Object', 'redux-framework' ),
83	'heading' => '',
84	'icon' => 'el el-info-circle',
85	'customizer' => false,

includes/options/redux-core/inc/extensions/options_object/options_object/field_options_object.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +22,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_options_object' ) ) {
27
28	/**
29	* Main ReduxFramework_options_object class


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

22	}
23
24	// Don't duplicate me!
25	+ if ( ! class_exists( 'ReduxFramework_options_object' ) ) {
26
27	/**
28	* Main ReduxFramework_options_object class

includes/options/redux-core/inc/fields/ace_editor/field_ace_editor.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_ace_editor' ) ) {
27	class ReduxFramework_ace_editor {
28
29	/**


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_ace_editor' ) ) {
27	class ReduxFramework_ace_editor {
28
29	/**

includes/options/redux-core/inc/fields/background/field_background.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ namespace ReduxCore\ReduxFramework;
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_background' ) ) {
27
28	/**
29	* Main ReduxFramework_background class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_background' ) ) {
27
28	/**
29	* Main ReduxFramework_background class

includes/options/redux-core/inc/fields/border/field_border.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -23,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
23	}
24
25	// Don't duplicate me!
26	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_border' ) ) {
27
28	class ReduxFramework_border {
29


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

23	}
24
25	// Don't duplicate me!
26	+ if ( ! class_exists( 'ReduxFramework_border' ) ) {
27
28	class ReduxFramework_border {
29

includes/options/redux-core/inc/fields/button_set/field_button_set.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -25,7 +25,7 @@ namespace ReduxCore\ReduxFramework;
25	}
26
27	// Don't duplicate me!
28	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_button_set' ) ) {
29
30	/**
31	* Main ReduxFramework_button_set class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

25	}
26
27	// Don't duplicate me!
28	+ if ( ! class_exists( 'ReduxFramework_button_set' ) ) {
29
30	/**
31	* Main ReduxFramework_button_set class

includes/options/redux-core/inc/fields/checkbox/field_checkbox.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -24,7 +24,7 @@ if ( !defined ( 'ABSPATH' ) ) {
24	}
25
26	// Don't duplicate me!
27	- if ( !class_exists ( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_checkbox' ) ) {
28
29	/**
30	* Main ReduxFramework_checkbox class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

24	}
25
26	// Don't duplicate me!
27	+ if ( !class_exists ( 'ReduxFramework_checkbox' ) ) {
28
29	/**
30	* Main ReduxFramework_checkbox class

includes/options/redux-core/inc/fields/color/field_color.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -25,7 +25,7 @@ if ( ! defined( 'ABSPATH' ) ) {
25	}
26
27	// Don't duplicate me!
28	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_color' ) ) {
29
30	/**
31	* Main ReduxFramework_color class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

25	}
26
27	// Don't duplicate me!
28	+ if ( ! class_exists( 'ReduxFramework_color' ) ) {
29
30	/**
31	* Main ReduxFramework_color class

includes/options/redux-core/inc/fields/color_gradient/field_color_gradient.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -24,7 +24,7 @@ if ( ! defined( 'ABSPATH' ) ) {
24	}
25
26	// Don't duplicate me!
27	- if ( ! class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_color_gradient' ) ) {
28
29	/**
30	* Main ReduxFramework_color_gradient class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

24	}
25
26	// Don't duplicate me!
27	+ if ( ! class_exists( 'ReduxFramework_color_gradient' ) ) {
28
29	/**
30	* Main ReduxFramework_color_gradient class

includes/options/redux-core/inc/fields/color_rgba/field_color_rgba.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -26,7 +26,7 @@ if( !defined( 'ABSPATH' ) ) {
26	}
27
28	// Don't duplicate me!
29	- if( !class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFramework_color_rgba' ) ) {
30
31	/**
32	* Main ReduxFramework_color_rgba class


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

26	}
27
28	// Don't duplicate me!
29	+ if( !class_exists( 'ReduxFramework_color_rgba' ) ) {
30
31	/**
32	* Main ReduxFramework_color_rgba class

includes/options/redux-core/inc/fields/date/field_date.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/dimensions/field_dimensions.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
	@@ -159,7 +159,7 @@ namespace ReduxCore\ReduxFramework;
159	}
160	echo '<div class="field-dimensions-input input-prepend">';
161	echo '<span class="add-on"><i class="el el-resize-horizontal icon-large"></i></span>';
162	- echo '<input type="text" class="redux-dimensions-input redux-dimensions-width mini ' . $this->field['class'] . '" placeholder="' . __( 'Width', '~~accelerated~~-~~mobile-pages~~' ) . '" rel="' . $this->field['id'] . '-width" value="' . filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) . '">';
163	echo '<input data-id="' . $this->field['id'] . '" type="hidden" id="' . $this->field['id'] . '-width" name="' . $this->field['name'] . $this->field['name_suffix'] . '[width]' . '" value="' . $this->value['width'] . '"></div>';
164	}
165
	@@ -175,7 +175,7 @@ namespace ReduxCore\ReduxFramework;
175	}
176	echo '<div class="field-dimensions-input input-prepend">';
177	echo '<span class="add-on"><i class="el el-resize-vertical icon-large"></i></span>';
178	- echo '<input type="text" class="redux-dimensions-input redux-dimensions-height mini ' . $this->field['class'] . '" placeholder="' . __( 'Height', '~~accelerated~~-~~mobile-pages~~' ) . '" rel="' . $this->field['id'] . '-height" value="' . filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) . '">';
179	echo '<input data-id="' . $this->field['id'] . '" type="hidden" id="' . $this->field['id'] . '-height" name="' . $this->field['name'] . $this->field['name_suffix'] . '[height]' . '" value="' . $this->value['height'] . '"></div>';
180	}
181
	@@ -186,8 +186,8 @@ namespace ReduxCore\ReduxFramework;
186	// fill out the options object and show it, otherwise it's hidden
187	// and the default units value will apply.
188	if ( isset( $this->field['units'] ) && $this->field['units'] !== false ) {
189	- echo '<div class="select_wrapper dimensions-units" original-title="' . __( 'Units', '~~accelerated~~-~~mobile-pages~~' ) . '">';
190	- echo '<select data-id="' . $this->field['id'] . '" data-placeholder="' . __( 'Units', '~~accelerated~~-~~mobile-pages~~' ) . '" class="redux-dimensions redux-dimensions-units select ' . $this->field['class'] . '" original-title="' . __( 'Units', '~~accelerated~~-~~mobile-pages~~' ) . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[units]' . '">';
191
192	// Extended units, show 'em all
193	if ( $this->field['units_extended'] ) {


1	<?php
2	+
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}

159	}
160	echo '<div class="field-dimensions-input input-prepend">';
161	echo '<span class="add-on"><i class="el el-resize-horizontal icon-large"></i></span>';
162	+ echo '<input type="text" class="redux-dimensions-input redux-dimensions-width mini ' . $this->field['class'] . '" placeholder="' . __( 'Width', 'redux-framework' ) . '" rel="' . $this->field['id'] . '-width" value="' . filter_var( $this->value['width'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) . '">';
163	echo '<input data-id="' . $this->field['id'] . '" type="hidden" id="' . $this->field['id'] . '-width" name="' . $this->field['name'] . $this->field['name_suffix'] . '[width]' . '" value="' . $this->value['width'] . '"></div>';
164	}
165

175	}
176	echo '<div class="field-dimensions-input input-prepend">';
177	echo '<span class="add-on"><i class="el el-resize-vertical icon-large"></i></span>';
178	+ echo '<input type="text" class="redux-dimensions-input redux-dimensions-height mini ' . $this->field['class'] . '" placeholder="' . __( 'Height', 'redux-framework' ) . '" rel="' . $this->field['id'] . '-height" value="' . filter_var( $this->value['height'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ) . '">';
179	echo '<input data-id="' . $this->field['id'] . '" type="hidden" id="' . $this->field['id'] . '-height" name="' . $this->field['name'] . $this->field['name_suffix'] . '[height]' . '" value="' . $this->value['height'] . '"></div>';
180	}
181

186	// fill out the options object and show it, otherwise it's hidden
187	// and the default units value will apply.
188	if ( isset( $this->field['units'] ) && $this->field['units'] !== false ) {
189	+ echo '<div class="select_wrapper dimensions-units" original-title="' . __( 'Units', 'redux-framework' ) . '">';
190	+ echo '<select data-id="' . $this->field['id'] . '" data-placeholder="' . __( 'Units', 'redux-framework' ) . '" class="redux-dimensions redux-dimensions-units select ' . $this->field['class'] . '" original-title="' . __( 'Units', 'redux-framework' ) . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[units]' . '">';
191
192	// Extended units, show 'em all
193	if ( $this->field['units_extended'] ) {

includes/options/redux-core/inc/fields/divide/field_divide.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/editor/field_editor.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/gallery/field_gallery.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/image_select/field_image_select.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/info/field_info.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/link_color/field_link_color.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/media/field_media.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/multi_text/field_multi_text.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by
	@@ -58,7 +58,7 @@ if ( ! class_exists( 'ReduxFramework_multi_text' ) ) {
58	*/
59	public function render() {
60
61	- $this->add_text = ( isset( $this->field['add_text'] ) ) ? $this->field['add_text'] : __( 'Add More', '~~accelerated~~-~~mobile-pages~~' );
62	$this->show_empty = ( isset( $this->field['show_empty'] ) ) ? $this->field['show_empty'] : true;
63
64	echo '<ul id="' . $this->field['id'] . '-ul" class="redux-multi-text">';
	@@ -66,14 +66,14 @@ if ( ! class_exists( 'ReduxFramework_multi_text' ) ) {
66	if ( isset( $this->value ) && is_array( $this->value ) ) {
67	foreach ( $this->value as $k => $value ) {
68	if ( $value != '' ) {
69	- echo '<li><input type="text" id="' . $this->field['id'] . '-' . $k . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[]' . '" value="' . esc_attr( $value ) . '" class="regular-text ' . $this->field['class'] . '" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', '~~accelerated~~-~~mobile-pages~~' ) . '</a></li>';
70	}
71	}
72	} elseif ( $this->show_empty == true ) {
73	- echo '<li><input type="text" id="' . $this->field['id'] . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[]' . '" value="" class="regular-text ' . $this->field['class'] . '" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', '~~accelerated~~-~~mobile-pages~~' ) . '</a></li>';
74	}
75
76	- echo '<li style="display:none;"><input type="text" id="' . $this->field['id'] . '" name="" value="" class="regular-text" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', '~~accelerated~~-~~mobile-pages~~' ) . '</a></li>';
77
78	echo '</ul>';
79	echo '<span style="clear:both;display:block;height:0;" /></span>';


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

58	*/
59	public function render() {
60
61	+ $this->add_text = ( isset( $this->field['add_text'] ) ) ? $this->field['add_text'] : __( 'Add More', 'redux-framework' );
62	$this->show_empty = ( isset( $this->field['show_empty'] ) ) ? $this->field['show_empty'] : true;
63
64	echo '<ul id="' . $this->field['id'] . '-ul" class="redux-multi-text">';

66	if ( isset( $this->value ) && is_array( $this->value ) ) {
67	foreach ( $this->value as $k => $value ) {
68	if ( $value != '' ) {
69	+ echo '<li><input type="text" id="' . $this->field['id'] . '-' . $k . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[]' . '" value="' . esc_attr( $value ) . '" class="regular-text ' . $this->field['class'] . '" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', 'redux-framework' ) . '</a></li>';
70	}
71	}
72	} elseif ( $this->show_empty == true ) {
73	+ echo '<li><input type="text" id="' . $this->field['id'] . '" name="' . $this->field['name'] . $this->field['name_suffix'] . '[]' . '" value="" class="regular-text ' . $this->field['class'] . '" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', 'redux-framework' ) . '</a></li>';
74	}
75
76	+ echo '<li style="display:none;"><input type="text" id="' . $this->field['id'] . '" name="" value="" class="regular-text" /> <a href="javascript:void(0);" class="deletion redux-multi-text-remove">' . __( 'Remove', 'redux-framework' ) . '</a></li>';
77
78	echo '</ul>';
79	echo '<span style="clear:both;display:block;height:0;" /></span>';

includes/options/redux-core/inc/fields/palette/field_palette.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/password/field_password.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Class ReduxFramework_password
5	*/


1	<?php
2	+
3	/**
4	* Class ReduxFramework_password
5	*/

includes/options/redux-core/inc/fields/radio/field_radio.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/raw/field_raw.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/section/field_section.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php

2	/**
3	* Redux Framework is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/select/elusive-icons.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Array of Elusive Icons
4	// Contributed by @WhatJustHappened
5	// Last updated: 14 Sept. 2013
	@@ -309,4 +309,4 @@ namespace ReduxCore\ReduxFramework;
309	return $elusiveIcons;
310	}
311
312	- add_filter( 'redux/font-icons', '~~ReduxCore\\ReduxFramework\\~~get_font_icons' );


1	<?php
2	+
3	// Array of Elusive Icons
4	// Contributed by @WhatJustHappened
5	// Last updated: 14 Sept. 2013

309	return $elusiveIcons;
310	}
311
312	+ add_filter( 'redux/font-icons', 'get_font_icons' );

includes/options/redux-core/inc/fields/select/field_select.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/select_image/field_select_image.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Field Select Image
5	*


1	<?php
2	+
3	/**
4	* Field Select Image
5	*

includes/options/redux-core/inc/fields/slider/field_slider.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/slides/field_slides.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by


1	<?php
2	+
3	/**
4	* Redux Framework is free software: you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License as published by

includes/options/redux-core/inc/fields/sortable/field_sortable.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/sorter/field_sorter.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;
	@@ -90,7 +90,6 @@ namespace ReduxCore\ReduxFramework;
90	}
91
92	$sortlists = $this->value;
93	-
94	if ( ! empty( $sortlists ) ) {
95	foreach ( $sortlists as $section => $arr ) {
96	$sortlists[ $section ] = $this->replace_id_with_slug( $arr );
	@@ -143,7 +142,7 @@ namespace ReduxCore\ReduxFramework;
143
144	if ( $sortlists ) {
145	echo '<fieldset id="' . esc_attr($this->field['id']) . '" class="redux-sorter-container redux-sorter">';
146	-
147	foreach ( $sortlists as $group => $sortlist ) {
148	$filled = "";
149


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

90	}
91
92	$sortlists = $this->value;

93	if ( ! empty( $sortlists ) ) {
94	foreach ( $sortlists as $section => $arr ) {
95	$sortlists[ $section ] = $this->replace_id_with_slug( $arr );

142
143	if ( $sortlists ) {
144	echo '<fieldset id="' . esc_attr($this->field['id']) . '" class="redux-sorter-container redux-sorter">';
145	+
146	foreach ( $sortlists as $group => $sortlist ) {
147	$filled = "";
148

includes/options/redux-core/inc/fields/spacing/field_spacing.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/spinner/field_spinner.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/switch/field_switch.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;
	@@ -52,7 +52,7 @@ if ( ! class_exists( 'ReduxFramework_switch' ) ) {
52	$switch_text = '<span class="'.$class_on.'">'.$this->field['on'].'</span><span class="'.$class_off.'">'.$this->field['off'].'</span>';
53	}
54
55	- echo '<div class="switch-options">
56	<label class="ios7-switch">
57	<input class="switch-on-off" type="checkbox" '.($cb_enabled==' selected' ? 'checked' : '').' data-id="' . $this->field['id'] . '">
58	<span></span>
	@@ -62,8 +62,6 @@ if ( ! class_exists( 'ReduxFramework_switch' ) ) {
62	echo $switch_text;
63	echo '</div>';
64
65	-
66	-
67	/* echo '<div class="switch-options">';
68	echo '<label class="cb-enable' . $cb_enabled . '" data-id="' . $this->field['id'] . '"><span>' . $this->field['on'] . '</span></label>';
69	echo '<label class="cb-disable' . $cb_disabled . '" data-id="' . $this->field['id'] . '"><span>' . $this->field['off'] . '</span></label>';


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

52	$switch_text = '<span class="'.$class_on.'">'.$this->field['on'].'</span><span class="'.$class_off.'">'.$this->field['off'].'</span>';
53	}
54
55	+ echo '<div class="switch-options">
56	<label class="ios7-switch">
57	<input class="switch-on-off" type="checkbox" '.($cb_enabled==' selected' ? 'checked' : '').' data-id="' . $this->field['id'] . '">
58	<span></span>

62	echo $switch_text;
63	echo '</div>';
64


65	/* echo '<div class="switch-options">';
66	echo '<label class="cb-enable' . $cb_enabled . '" data-id="' . $this->field['id'] . '"><span>' . $this->field['on'] . '</span></label>';
67	echo '<label class="cb-disable' . $cb_disabled . '" data-id="' . $this->field['id'] . '"><span>' . $this->field['off'] . '</span></label>';

includes/options/redux-core/inc/fields/text/field_text.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;


1	<?php
2	+
3	// Exit if accessed directly
4	if ( ! defined( 'ABSPATH' ) ) {
5	exit;

includes/options/redux-core/inc/fields/textarea/field_textarea.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/*
4	* @package Redux_Framework
5	* @subpackage Fields


1	<?php
2	+
3	/*
4	* @package Redux_Framework
5	* @subpackage Fields

includes/options/redux-core/inc/fields/typography/field_typography.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* Class and Function List:
5	* Function list:
	@@ -475,9 +475,9 @@ if ( ! class_exists( 'ReduxFramework_typography' ) ) {
475	}
476
477	echo '<div class="picker-wrapper">';
478	- echo '<label>' . __( 'Font Color', '~~accelerated~~-~~mobile-pages~~' ) . '</label>';
479	echo '<div id="' . $this->field['id'] . '_color_picker" class="colorSelector typography-color"><div style="background-color: ' . $this->value['color'] . '"></div></div>';
480	- echo '<input data-default-color="' . $default . '" class="redux-color redux-typography-color ' . $this->field['class'] . '" original-title="' . __( 'Font color', '~~accelerated~~-~~mobile-pages~~' ) . '" id="' . $this->field['id'] . '-color" name="' . $this->field['name'] . $this->field['name_suffix'] . '[color]' . '" type="text" value="' . $this->value['color'] . '" data-id="' . $this->field['id'] . '" />';
481	echo '</div>';
482	}
483
	@@ -887,7 +887,7 @@ if ( ! class_exists( 'ReduxFramework_typography' ) ) {
887	}
888
889	$this->parent->font_groups['std'] = array(
890	- 'text' => __( 'Standard Fonts', '~~accelerated~~-~~mobile-pages~~' ),
891	'children' => array(),
892	);
893
	@@ -988,7 +988,7 @@ if ( ! class_exists( 'ReduxFramework_typography' ) ) {
988
989	// optgroup
990	$this->parent->font_groups['google'] = array(
991	- 'text' => __( 'Google Webfonts', '~~accelerated~~-~~mobile-pages~~' ),
992	'children' => array(),
993	);
994


1	<?php
2	+
3	/**
4	* Class and Function List:
5	* Function list:

475	}
476
477	echo '<div class="picker-wrapper">';
478	+ echo '<label>' . __( 'Font Color', 'redux-framework' ) . '</label>';
479	echo '<div id="' . $this->field['id'] . '_color_picker" class="colorSelector typography-color"><div style="background-color: ' . $this->value['color'] . '"></div></div>';
480	+ echo '<input data-default-color="' . $default . '" class="redux-color redux-typography-color ' . $this->field['class'] . '" original-title="' . __( 'Font color', 'redux-framework' ) . '" id="' . $this->field['id'] . '-color" name="' . $this->field['name'] . $this->field['name_suffix'] . '[color]' . '" type="text" value="' . $this->value['color'] . '" data-id="' . $this->field['id'] . '" />';
481	echo '</div>';
482	}
483

887	}
888
889	$this->parent->font_groups['std'] = array(
890	+ 'text' => __( 'Standard Fonts', 'redux-framework' ),
891	'children' => array(),
892	);
893

988
989	// optgroup
990	$this->parent->font_groups['google'] = array(
991	+ 'text' => __( 'Google Webfonts', 'redux-framework' ),
992	'children' => array(),
993	);
994

includes/options/redux-core/inc/fields/upload/field_upload.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	class Redux_Options_upload {
4
5	/**


1	<?php

2	class Redux_Options_upload {
3
4	/**

includes/options/redux-core/inc/lib.redux_instances.php CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* ReduxFrameworkInstances Functions
5	*


1	<?php
2	+
3	/**
4	* ReduxFrameworkInstances Functions
5	*

includes/options/redux-core/inc/themecheck/class.redux_themecheck.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Redux ThemeCheck
5	*


1	<?php

2	/**
3	* Redux ThemeCheck
4	*

includes/options/redux-core/inc/tracking.php CHANGED Viewed

	@@ -1,9 +1,9 @@
1	<?php
2	- ~~namespace ReduxCore\ReduxFramework;~~
3	/**
4	* @package Redux_Tracking
5	*/
6	- if ( ! class_exists( '~~ReduxCore\\~~ReduxFramework~~\\ReduxFramework~~' ) ) {
7	return;
8	}
9
	@@ -315,8 +315,8 @@ namespace ReduxCore\ReduxFramework;
315	'release' => PHP_VERSION
316	);
317
318	- $user_query = new \WP_User_Query( array( 'blog_id' => $blog_id, 'count_total' => true, ) );
319	- $comments_query = new \WP_Comment_Query();
320	$data = array(
321	'_id' => $this->options['hash'],
322	'localhost' => ( $_SERVER['REMOTE_ADDR'] === '127.0.0.1' ) ? 1 : 0,
	@@ -472,7 +472,7 @@ namespace ReduxCore\ReduxFramework;
472	return $options;
473	}
474
475	- add_filter( 'redux/tracking/options', '~~ReduxCore\\ReduxFramework\\~~redux_tracking_additions' );
476
477	function redux_allow_tracking_callback() {
478	// Verify that the incoming request is coming with the security nonce
	@@ -496,6 +496,6 @@ namespace ReduxCore\ReduxFramework;
496	} // end if
497	}
498
499	- add_action( 'wp_ajax_redux_allow_tracking', '~~ReduxCore\\ReduxFramework\\~~redux_allow_tracking_callback' );
500
501	}


1	<?php
2	+
3	/**
4	* @package Redux_Tracking
5	*/
6	+ if ( ! class_exists( 'ReduxFramework' ) ) {
7	return;
8	}
9

315	'release' => PHP_VERSION
316	);
317
318	+ $user_query = new WP_User_Query( array( 'blog_id' => $blog_id, 'count_total' => true, ) );
319	+ $comments_query = new WP_Comment_Query();
320	$data = array(
321	'_id' => $this->options['hash'],
322	'localhost' => ( $_SERVER['REMOTE_ADDR'] === '127.0.0.1' ) ? 1 : 0,

472	return $options;
473	}
474
475	+ add_filter( 'redux/tracking/options', 'redux_tracking_additions' );
476
477	function redux_allow_tracking_callback() {
478	// Verify that the incoming request is coming with the security nonce

496	} // end if
497	}
498
499	+ add_action( 'wp_ajax_redux_allow_tracking', 'redux_allow_tracking_callback' );
500
501	}

includes/options/redux-core/inc/welcome/views/status_report.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* Admin View: Page - Status Report
5	*/


1	<?php

2	/**
3	* Admin View: Page - Status Report
4	*/

includes/options/redux-core/inc/welcome/welcome.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	if ( ! defined( 'ABSPATH' ) ) {
4	exit;
5	}
	@@ -66,7 +65,7 @@ namespace ReduxCore\ReduxFramework;
66
67	if ( Redux_Helpers::isLocalHost() ) {
68	$compare = true;
69	- } else if ( class_exists( '~~ReduxCore\\ReduxFramework\\~~ReduxFrameworkPlugin' ) ) {
70	$compare = true;
71	} else {
72	$redux = ReduxFrameworkInstances::get_all_instances();


1	<?php

2	if ( ! defined( 'ABSPATH' ) ) {
3	exit;
4	}

65
66	if ( Redux_Helpers::isLocalHost() ) {
67	$compare = true;
68	+ } else if ( class_exists( 'ReduxFrameworkPlugin' ) ) {
69	$compare = true;
70	} else {
71	$redux = ReduxFrameworkInstances::get_all_instances();

includes/options/redux-core/templates/panel/container.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the main panel container.
5	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.


1	<?php

2	/**
3	* The template for the main panel container.
4	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.

includes/options/redux-core/templates/panel/content.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the main content of the panel.
5	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.


1	<?php

2	/**
3	* The template for the main content of the panel.
4	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.

includes/options/redux-core/templates/panel/footer.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the panel footer area.
5	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.


1	<?php

2	/**
3	* The template for the panel footer area.
4	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.

includes/options/redux-core/templates/panel/header.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the panel header area.
5	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.
	@@ -67,7 +66,6 @@ namespace ReduxCore\ReduxFramework;
67	<?php if ( ! empty( $this->parent->args['display_version'] ) ) { ?>
68	<span><?php echo wp_kses_post( $this->parent->args['display_version'] ); ?></span>
69	<?php } ?>
70	-
71	</div>
72	<?php } ?>
73


1	<?php

2	/**
3	* The template for the panel header area.
4	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.

66	<?php if ( ! empty( $this->parent->args['display_version'] ) ) { ?>
67	<span><?php echo wp_kses_post( $this->parent->args['display_version'] ); ?></span>
68	<?php } ?>

69	</div>
70	<?php } ?>
71

includes/options/redux-core/templates/panel/header_stickybar.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the header sticky bar.
5	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.


1	<?php

2	/**
3	* The template for the header sticky bar.
4	* Override this template by specifying the path where it is stored (templates_path) in your Redux config.

includes/options/redux-core/templates/panel/menu_container.tpl.php CHANGED Viewed

	@@ -1,5 +1,4 @@
1	<?php
2	- namespace ReduxCore\ReduxFramework;
3	/**
4	* The template for the menu container of the panel.
5	*


1	<?php

2	/**
3	* The template for the menu container of the panel.
4	*

includes/redirect.php CHANGED Viewed

@@ -333,22 +333,4 @@ function ampforwp_redirect_to_orginal_url(){
+              }
               return;
+            }
-            -
            // #1947 ends here
-            -
-            -
            //Auto redirect /amp to ?amp when 'Change End Point to ?amp' option is enabled #2480
-            -
            add_action('template_redirect', 'ampforwp_redirect_proper_qendpoint' );
-            -
            if ( ! function_exists('ampforwp_redirect_proper_qendpoint') ) {
-            -
              function ampforwp_redirect_proper_qendpoint($current_url){
-            -
                if ( ampforwp_is_amp_endpoint() && true == ampforwp_get_setting('amp-core-end-point') ){
-            -
                  global $wp;
-            -
                  $current_url = $endpoint = $new_url = '';
-            -
                  $current_url = home_url($wp->request);
-            -
                  $endpoint = '?' . AMPFORWP_AMP_QUERY_VAR;
-            -
                  if ( false !== strpos($current_url, '/amp') ) {
-            -
                    $new_url = str_replace('/amp', $endpoint , $current_url );
-            -
                    wp_safe_redirect( $new_url );
-            -
                    exit;
-            -
                  }
-            -
                }
-            -
              }
-            -
            }

+              }
               return;
+            }
+            +
            // #1947 ends here

includes/vendor/amp/includes/lib/fasterimage/FasterImage.php CHANGED Viewed

	@@ -36,7 +36,8 @@ class FasterImage
36	public function batch(array $urls)
37	{
38
39	-

40	$results = [];
41	$request = array();
42	foreach ( array_values($urls) as $count => $uri ) {
	@@ -49,13 +50,11 @@ class FasterImage
49	$options= array(
50	'timeout'=>$this->timeout,
51	'connect_timeout'=>$this->timeout,
52	- 'useragent'=>'Mozilla/5.0 (~~Windows~~ NT ~~10.0;~~ ~~Win64;~~ ~~x64~~) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36',
53	'verify'=> 1,
54	'verifyname'=>1,
55	- 'follow_redirects'=>~~true~~,
56	- 'complete'=> function($response, $url) use(&$results){
57	- $stream = new Stream();
58	- $parser = new ImageParser($stream);
59	$results[$url]['rounds'] = 0;
60	$results[$url]['bytes'] = 0;
61	$results[$url]['size'] = 'failed';


36	public function batch(array $urls)
37	{
38
39	+ $stream = new Stream();
40	+ $parser = new ImageParser($stream);
41	$results = [];
42	$request = array();
43	foreach ( array_values($urls) as $count => $uri ) {

50	$options= array(
51	'timeout'=>$this->timeout,
52	'connect_timeout'=>$this->timeout,
53	+ 'useragent'=>'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36',
54	'verify'=> 1,
55	'verifyname'=>1,
56	+ 'follow_redirects'=>false,
57	+ 'complete'=> function($response, $url) use(&$results, &$parser, &$stream){


58	$results[$url]['rounds'] = 0;
59	$results[$url]['bytes'] = 0;
60	$results[$url]['size'] = 'failed';

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.1
7	- Stable tag: 0.9.97.41
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -186,13 +186,15 @@ You can contact us from [here](https://ampforwp.com/contact/)
186
187	== Changelog ==
188
189	- = 0.9.97.41 (~~11th~~ March 2019) =
190	- * Added: ~~Color~~ ~~picker~~ for ~~Footer~~ ~~Area~~ #~~2320~~
191	- * Added: ~~Compatibility~~ ~~with~~ WP ~~User~~ ~~Avatar~~ ~~plugin~~ ~~to show the gravatar #2772~~
192	- * Fixed: ~~Options~~ ~~Panel~~ ~~not showing, says "You~~ are ~~not~~ ~~allowed~~ ~~to access this page"~~ #~~2377~~
193	- * Fixed: ~~faster-image~~ ~~libraries~~ not ~~being~~ ~~able~~ to ~~determine~~ ~~dimensions~~ #~~2692~~
194	- * Fixed: ~~Changes~~ in ~~endpoint~~ to ~~?amp,~~ ~~Re-direct~~ " ~~/amp~~ ~~" to " ?amp "~~ #~~2480~~
195	- * Fixed: ~~Font~~ ~~style~~ ~~getting~~ ~~change~~ ~~on Custom Front~~ page #~~2594~~
196	- * Fixed: ~~When~~ ~~the~~ ~~user~~ is ~~directed~~ ~~to the~~ AMP ~~version of the page it changes the URL slighltly (swaps out characters)~~ #~~2913~~


197
198	Full changelog available in changelog.txt


4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.1
7	+ Stable tag: 0.9.97.42
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

186
187	== Changelog ==
188
189	+ = 0.9.97.40 (9th March 2019) =
190	+ * Added: Smooth scrolling for anchors links and jumping links within a page #2062
191	+ * Added: Option to Enable/Disable Merriweather font in Design-1
192	+ * Fixed: External links are getting skipped #2862
193	+ * Fixed: Social Share “LINE” does not show up in swift theme #2641
194	+ * Fixed: Checkbox from menu listings in AMP theme framework #2618
195	+ * Fixed: PHP Warning undefined index fb-instant-page #2610
196	+ * Fixed: Instagram Posts not rendering in AMP #2629
197	+ * Fixed: Instant articles Image issue #2929
198	+ * Fixed: Default height & width values for amp-img when values are not set #2925
199
200	Full changelog available in changelog.txt

templates/design-manager/design-1/style.php CHANGED Viewed

	@@ -127,11 +127,6 @@ blockquote {color: <?php echo sanitize_hex_color( $text_color ); ?>;background:
127	margin: 0 auto;
128	}
129	/* Footer */
130	- <?php $footer_back_color = $redux_builder_amp['ampforwp-footer-background-color-1']['color'];
131	- if (empty($footer_back_color)) {
132	- $footer_back_color = '#FFFFFF';
133	- }?>
134	- .amp-wp-footer{ background: <?php echo ampforwp_sanitize_color($footer_back_color);?>; }
135	.footer_menu ul{ list-style-type: none; padding: 0; text-align: center; margin: 0px 20px 25px 20px; line-height: 27px; font-size: 13px }
136	.footer_menu ul li{ display:inline; margin:0 10px; }
137	.footer_menu ul li:first-child{ margin-left:0 }


127	margin: 0 auto;
128	}
129	/* Footer */





130	.footer_menu ul{ list-style-type: none; padding: 0; text-align: center; margin: 0px 20px 25px 20px; line-height: 27px; font-size: 13px }
131	.footer_menu ul li{ display:inline; margin:0 10px; }
132	.footer_menu ul li:first-child{ margin-left:0 }

templates/design-manager/design-2/style.php CHANGED Viewed

	@@ -168,11 +168,7 @@ main .amp-archive-heading{ background : none; box-shadow: none; padding: 5px; }
168	<?php if(is_author()){ ?> .author-archive amp-img{border-radius: 50%;margin: 0px 8px 10px;display: block;}.author-archive{float: left;} .amp-wp-content .taxonomy-description{background: #f1f1f1; padding:0px} .page-title{padding:0} <?php } ?>
169
170	/* Footer */
171	- ~~<?php~~ ~~$footer_back_color~~ = ~~$redux_builder_amp['ampforwp~~-~~footer~~-~~background~~-~~color-2']['color']~~;
172	- if (empty($footer_back_color)) {
173	- $footer_back_color = '#FFFFFF';
174	- } ?>
175	- #footer{ background: <?php echo ampforwp_sanitize_color($footer_back_color);?>; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 20px 0; }
176	#footer p:first-child{ margin-bottom: 12px; }
177	#footer p{ margin: 0 }
178	.footer_menu ul{ list-style-type: none; padding: 0; text-align: center; margin: 0px 20px 25px 20px; line-height: 27px; font-size: 13px }


168	<?php if(is_author()){ ?> .author-archive amp-img{border-radius: 50%;margin: 0px 8px 10px;display: block;}.author-archive{float: left;} .amp-wp-content .taxonomy-description{background: #f1f1f1; padding:0px} .page-title{padding:0} <?php } ?>
169
170	/* Footer */
171	+ #footer{ background : #fff; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 20px 0; }




172	#footer p:first-child{ margin-bottom: 12px; }
173	#footer p{ margin: 0 }
174	.footer_menu ul{ list-style-type: none; padding: 0; text-align: center; margin: 0px 20px 25px 20px; line-height: 27px; font-size: 13px }

templates/design-manager/design-3/style.php CHANGED Viewed

	@@ -168,11 +168,7 @@ body .amp-loop-list-noimg .amp-wp-post-content{ width:100% }
168	.amp-wp-post-content .small-screen-excerpt-design-3 {display: none;} .amp-wp-post-content .large-screen-excerpt-design-3 { display: block; }
169	<?php } ?>
170	/* Footer */
171	- ~~<?php~~ ~~$footer_back_color~~ = ~~$redux_builder_amp['ampforwp~~-~~footer~~-~~background~~-~~color~~-~~3']['color']~~;
172	- if (empty($footer_back_color)) {
173	- $footer_back_color = '#151515';
174	- } ?>
175	- #footer{ background: <?php echo ampforwp_sanitize_color($footer_back_color);?>; color: #eee; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 35px 0 35px 0; margin-top: 30px; }
176	#footer a{ color:#fff }
177	#footer p:first-child{ margin-bottom: 12px; }
178	#footer .social_icons{ margin: 0px 20px 25px 20px; border-bottom: 1px solid #3c3c3c; padding-bottom: 25px; }


168	.amp-wp-post-content .small-screen-excerpt-design-3 {display: none;} .amp-wp-post-content .large-screen-excerpt-design-3 { display: block; }
169	<?php } ?>
170	/* Footer */
171	+ #footer{ background: #151515; color: #eee; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 35px 0 35px 0; margin-top: 30px; }




172	#footer a{ color:#fff }
173	#footer p:first-child{ margin-bottom: 12px; }
174	#footer .social_icons{ margin: 0px 20px 25px 20px; border-bottom: 1px solid #3c3c3c; padding-bottom: 25px; }

templates/features.php CHANGED Viewed

	@@ -5041,12 +5041,12 @@ function ampforwp_generate_meta_desc($json=""){
5041	}
5042
5043	//Compatibility with WP User Avatar #975
5044	- function ampforwp_get_wp_user_avatar(~~$object='',$type=''~~){
5045	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
5046	if(is_plugin_active( 'wp-user-avatar/wp-user-avatar.php' )){
5047	if(class_exists('WP_User_Avatar_Functions')){
5048	$user_avatar_url = '';
5049	- $user_avatar_url = get_wp_user_avatar_src(~~$object~~);
5050	return $user_avatar_url;
5051	}
5052	}
	@@ -6048,10 +6048,7 @@ if( ! function_exists('ampforwp_get_comments_gravatar') ){
6048	}
6049	$gravatar_exists = '';
6050	$gravatar_exists = ampforwp_gravatar_checker($comment->comment_author_email);
6051	- if ( ~~null !== ampforwp_get_wp_user_avatar(~~$~~comment,~~ ~~'comment')~~ ) {
6052	- return ampforwp_get_wp_user_avatar($comment, 'comment');
6053	- }
6054	- elseif($gravatar_exists == true){
6055	return get_avatar_url( $comment, apply_filters( 'ampforwp_get_comments_gravatar', '60' ), '' );
6056	}
6057	else


5041	}
5042
5043	//Compatibility with WP User Avatar #975
5044	+ function ampforwp_get_wp_user_avatar(){
5045	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
5046	if(is_plugin_active( 'wp-user-avatar/wp-user-avatar.php' )){
5047	if(class_exists('WP_User_Avatar_Functions')){
5048	$user_avatar_url = '';
5049	+ $user_avatar_url = get_wp_user_avatar_src();
5050	return $user_avatar_url;
5051	}
5052	}

6048	}
6049	$gravatar_exists = '';
6050	$gravatar_exists = ampforwp_gravatar_checker($comment->comment_author_email);
6051	+ if($gravatar_exists == true){



6052	return get_avatar_url( $comment, apply_filters( 'ampforwp_get_comments_gravatar', '60' ), '' );
6053	}
6054	else

templates/frontpage-elements.php CHANGED Viewed

	@@ -215,7 +215,6 @@ function ampforwp_design_3_frontpage_content($template, $post_id){
215	$amp_custom_content_enable = get_post_meta( $post_id, 'ampforwp_custom_content_editor_checkbox', true);?>
216	<main>
217	<article class="amp-wp-article">
218	- <div class="amp-wp-article-content">
219	<?php do_action( 'ampforwp_design_3_frontpage_title', $template ); ?>
220	<?php do_action('ampforwp_before_featured_image_hook', $template ); ?>
221	<?php $featured_image = $template->get( 'featured_image' );
	@@ -285,7 +284,6 @@ function ampforwp_design_3_frontpage_content($template, $post_id){
285	<div class="amp-wp-content post-pagination-meta">
286	<?php $template->load_parts( apply_filters( 'amp_post_template_meta_parts', array( 'meta-taxonomy' ) ) ); ?>
287	</div>
288	- </div>
289	</article>
290	</main>
291	<?php


215	$amp_custom_content_enable = get_post_meta( $post_id, 'ampforwp_custom_content_editor_checkbox', true);?>
216	<main>
217	<article class="amp-wp-article">

218	<?php do_action( 'ampforwp_design_3_frontpage_title', $template ); ?>
219	<?php do_action('ampforwp_before_featured_image_hook', $template ); ?>
220	<?php $featured_image = $template->get( 'featured_image' );

284	<div class="amp-wp-content post-pagination-meta">
285	<?php $template->load_parts( apply_filters( 'amp_post_template_meta_parts', array( 'meta-taxonomy' ) ) ); ?>
286	</div>

287	</article>
288	</main>
289	<?php

AMP for WP – Accelerated Mobile Pages - Version 0.9.97.42

Version Description

Release Info

Code changes from version 0.9.97.41 to 0.9.97.42