Redux Opti + Some apidae bugfixes

Author: Tofandel

.gitignore

@@ -56,3 +56,5 @@ composer.phar
 vendor/**/.git
 vendor/**/.editorconfig
 /admin/redux-extensions/shortcodes/
+plugins/redux-extensions-examples
+plugins/redux-dev-master

WPlusPlusCore.php

@@ -24,7 +24,7 @@
  * Plugin Name: W++ Core
  * Plugin URI: https://github.com/tofandel/wplusplus-core/
  * Description: A Wordpress Plugin acting as core for other of my plugins and including the Ultimate Redux Framework Bundle and OOP APIs to use it
- * Version: 1.8
+ * Version: 1.8.1
  * Author: Adrien Foulon <tofandel@tukan.hu>
  * Author URI: https://tukan.fr/a-propos/#adrien-foulon
  * Text Domain: wppc
@@ -42,6 +42,11 @@ class WPlusPlusCore extends WP_Plugin implements WP_Plugin_Interface {
 	protected $no_redux = true;
 
 	public function actionsAndFilters() {
+		add_action('site_transient_update_plugins', [$this, 'WPPBundledUpdate']);
+	}
+
+	public function WPPBundledUpdate() {
+
 	}
 
 	public function definitions() {
@@ -56,7 +61,7 @@ public function menusAndSettings() {
 	}
 
 	public function upgrade( $last_version ) {
-		// Nothing yet
+		$this->copy( 'wplusplus-muloader.php.bak', self::MULOADER_DIR . '/wplusplus-muloader.php' );
 	}
 
 	public function activated() {

functions.php

@@ -845,13 +845,14 @@ function wpp_slugify( $string, $slashes = true ) {
 /**
  * Order a multidimensional array from a subelement set specified as a path "foo.bar.orderValue"
  *
- * @param $array
- * @param $path
+ * @param array $array
+ * @param string $path
+ * @param bool $keep_keys
  *
  * @return array
  * @throws Exception
  */
-function wpp_order_by( $array, $path ) {
+function wpp_order_by( $array, $path, $keep_keys = false ) {
 	if ( empty( $array ) ) {
 		return array();
 	}
@@ -861,7 +862,7 @@ function wpp_order_by( $array, $path ) {
 	$path = explode( '.', $path );
 	$c    = count( $path );
 	// Sort the multidimensional array
-	usort( $array, function ( $a, $b ) use ( $path, $c ) {
+	($keep_keys ? 'uasort' : 'usort')( $array, function ( $a, $b ) use ( $path, $c ) {
 		$v1 = $a;
 		for ( $i = 0; $i < $c; $i ++ ) {
 			$k = $path[ $i ];
@@ -892,8 +893,8 @@ function wpp_order_by( $array, $path ) {
  *
  * If multiple elements exist with the same value they will be grouped and merged recursively (the scalar elements will become indexed array)
  *
- * @param $array
- * @param $path
+ * @param array $array
+ * @param string $path
  *
  * @return array
  * @throws Exception

plugins/redux-extensions/codemirror/codemirror/field_codemirror.php

@@ -23,7 +23,7 @@
 }
 
 // Don't duplicate me!
-if ( ! class_exists( 'ReduxFramework_Field_codemirror' ) ) {
+if ( ! class_exists( 'ReduxFramework_Field_codemirror', false ) ) {
 
 	/**
 	 * Main ReduxFramework_Field_codemirror class

plugins/redux-extensions/codemirror/extension_codemirror.php

@@ -25,7 +25,7 @@
 }
 
 // Don't duplicate me!
-if ( ! class_exists( 'ReduxFramework_extension_codemirror' ) ) {
+if ( ! class_exists( 'ReduxFramework_extension_codemirror', false ) ) {
 
 
 	/**

plugins/redux-extensions/color_scheme/color_scheme/attachment.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( ! class_exists( 'ReduxColorSchemeImport' ) ) {
+if ( ! class_exists( 'ReduxColorSchemeImport', false ) ) {
 	class ReduxColorSchemeImport {
 
 		// Private variables

plugins/redux-extensions/color_scheme/color_scheme/field_color_scheme.php

@@ -24,7 +24,7 @@
 }
 
 // Don't duplicate me!
-if ( ! class_exists( 'ReduxFramework_color_scheme' ) ) {
+if ( ! class_exists( 'ReduxFramework_color_scheme', false ) ) {
 
 	/**
 	 * Main ReduxFramework_color_scheme class

plugins/redux-extensions/color_scheme/color_scheme/inc/class.color_scheme_functions.php

@@ -12,7 +12,7 @@
 
 //print_r($GLOBALS['rdxIO']);
 
-if ( ! class_exists( 'ReduxColorSchemeFunctions' ) ) {
+if ( ! class_exists( 'ReduxColorSchemeFunctions', false ) ) {
 	class ReduxColorSchemeFunctions {
 
 		// public variables

plugins/redux-extensions/color_scheme/extension_color_scheme.php

@@ -28,7 +28,7 @@
 }
 
 // Don't duplicate me!
-if ( ! class_exists( 'ReduxFramework_extension_color_scheme' ) ) {
+if ( ! class_exists( 'ReduxFramework_extension_color_scheme', false ) ) {
 
 
 	/**

plugins/redux-extensions/css_layout/css_layout/field_css_layout.php

@@ -24,7 +24,7 @@
 }
 
 // Don't duplicate me!
-if ( ! class_exists( 'ReduxFramework_css_layout' ) ) {
+if ( ! class_exists( 'ReduxFramework_css_layout', false ) ) {
 
 	/**
 	 * Main ReduxFramework_css_layout class