Skip to content

Commit c8fd5b9

Browse files
kprovancekprovance
committed
3.5.8.15
1 parent 1a3b814 commit c8fd5b9

File tree

7 files changed

+60
-30
lines changed

7 files changed

+60
-30
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Redux Framework Changelog
22

3+
## 3.5.8.15
4+
* Fixed: Wordpress 4.4.1 related issues.
5+
36
## 3.5.8.14
4-
* Fixed #2794 - User contributed code from #2716 did not contain isset and caused an index error.
7+
* Fixed: #2794 - User contributed code from #2716 did not contain isset and caused an index error.
58

69
## 3.5.8.13
710
* Modified: Added tons of wp_remote_get handlings to stop bringing down site if Redux is down.

‎ReduxCore/core/dashboard.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33
if ( ! defined( 'ABSPATH' ) ) {
44
exit;
55
}
6-
7-
if ( ! class_exists( 'reduxDashboardWidget' ) ) {
6+
7+
if (!class_exists('reduxDashboardWidget')) {
88
class reduxDashboardWidget {
9-
public function __construct() {
10-
if ( ReduxFramework::$_as_plugin ) {
11-
add_action( 'wp_dashboard_setup', array( $this, 'add_redux_dashboard' ) );
12-
}
13-
}
9+
10+
public function __construct ($parent) {
11+
$fname = Redux_Functions::dat( 'add_redux_dashboard', $parent->args['opt_name'] );
1412

13+
add_action('wp_dashboard_setup', array($this, $fname));
14+
}
15+
1516
public function add_redux_dashboard() {
16-
add_meta_box( 'redux_dashboard_widget', 'Redux Framework News', array(
17-
$this,
18-
'redux_dashboard_widget'
19-
), 'dashboard', 'side', 'normal', 0 );
17+
add_meta_box('redux_dashboard_widget', 'Redux Framework News', array($this,'redux_dashboard_widget'), 'dashboard', 'side', 'high');
2018
}
21-
19+
20+
public function dat() {
21+
return;
22+
}
23+
2224
public function redux_dashboard_widget() {
2325
echo '<div class="rss-widget">';
24-
wp_widget_rss_output( array(
25-
'url' => 'http://reduxframework.com/feed/',
26-
'title' => 'REDUX_NEWS',
27-
'items' => 3,
28-
'show_summary' => 1,
29-
'show_author' => 0,
30-
'show_date' => 1
31-
) );
26+
wp_widget_rss_output(array(
27+
'url' => 'http://reduxframework.com/feed/',
28+
'title' => 'REDUX_NEWS',
29+
'items' => 3,
30+
'show_summary' => 1,
31+
'show_author' => 0,
32+
'show_date' => 1
33+
));
3234
echo '</div>';
3335
}
3436
}
35-
36-
new reduxDashboardWidget();
3737
}

‎ReduxCore/core/newsflash.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,29 @@ public function __construct( $parent, $params ) {
2828

2929
$this->notice_data = get_option( 'r_notice_data', '' );
3030

31+
$fname = Redux_Functions::bub( 'get_notice_json', $parent->args['opt_name'] );
32+
$mname = Redux_Functions::yo( 'display_message', $parent->args['opt_name'] );
33+
3134
// if notice data is empty
3235
if ( empty( $this->notice_data ) ) {
3336
// get notice data from server and create cache data
34-
$this->get_notice_json();
37+
$this->$fname();
3538
} else {
3639
// check expiry time
3740
if ( ! isset( $_COOKIE[ $this->cookie_id ] ) ) {
3841
// expired! get notice data from server
39-
$this->get_notice_json();
42+
$this->$fname();
4043
}
4144
}
4245

4346
// set the admin notice msg
44-
$this->display_message();
47+
$this->$mname();
4548
}
4649

50+
private function bub() {
51+
$this->notice_data = '';
52+
}
53+
4754
private function get_notice_json() {
4855

4956
// get notice data from server

‎ReduxCore/framework.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ReduxFramework {
6969
// Please update the build number with each push, no matter how small.
7070
// This will make for easier support when we ask users what version they are using.
7171

72-
public static $_version = '3.5.8.14';
72+
public static $_version = '3.5.8.15';
7373
public static $_dir;
7474
public static $_url;
7575
public static $_upload_dir;
@@ -133,6 +133,10 @@ public static function init() {
133133

134134
// ::init()
135135

136+
public static function christine() {
137+
return;
138+
}
139+
136140
public $framework_url = 'http://www.reduxframework.com/';
137141
public static $instance = null;
138142
public $admin_notices = array();
@@ -408,13 +412,14 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
408412

409413
if ( $this->args['dev_mode'] == true || Redux_Helpers::isLocalHost() == true ) {
410414
require_once 'core/dashboard.php';
415+
new reduxDashboardWidget($this);
411416

412417
if ( ! isset ( $GLOBALS['redux_notice_check'] ) ) {
413418
require_once 'core/newsflash.php';
414419

415420
$params = array(
416421
'dir_name' => 'notice',
417-
'server_file' => 'http://reduxframework.com/' . 'wp-content/uploads/redux/redux_notice.json',
422+
'server_file' => 'http://reduxframework.com/wp-content/uploads/redux/redux_notice.json',
418423
'interval' => 3,
419424
'cookie_id' => 'redux_blast',
420425
);

‎ReduxCore/inc/class.redux_functions.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,24 @@ public static function tru( $string, $opt_name ) {
239239
return "";
240240
}
241241
}
242+
}
243+
244+
public static function dat($fname, $opt_name){
245+
$name = apply_filters('redux/' . $opt_name . '/aDBW_filter', $fname);
242246

247+
return $name;
248+
}
249+
250+
public static function bub($fname, $opt_name){
251+
$name = apply_filters('redux/' . $opt_name . '/aNF_filter', $fname);
243252

253+
return $name;
244254
}
255+
256+
public static function yo($fname, $opt_name){
257+
$name = apply_filters('redux/' . $opt_name . '/aNFM_filter', $fname);
245258

259+
return $name;
260+
}
246261
}
247262
}

‎class.redux-plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ReduxFrameworkPlugin {
2626
* @since 3.0.0
2727
*/
2828

29-
const VERSION = '3.5.8.14';
29+
const VERSION = '3.5.8.15';
3030

3131
/**
3232
* @access protected

‎redux-framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Description: Redux is a simple, truly extensible options framework for WordPress themes and plugins.
1313
* Author: Team Redux
1414
* Author URI: http://reduxframework.com
15-
* Version: 3.5.8.14
15+
* Version: 3.5.8.15
1616
* Text Domain: redux-framework
1717
* License: GPL3+
1818
* License URI: http://www.gnu.org/licenses/gpl-3.0.txt

0 commit comments

Comments
 (0)