#1440

Signed-off-by:KProvance <[email protected]>

Author: kprovance

README.md

@@ -78,6 +78,9 @@ Send me an email at [email protected] so I can add you to our user sp
 
 ### Master ###
 
+= 3.3.3.7 =
+* Fixed:      #1440 - flaw in new cleanFilePath logic.
+
 = 3.3.3.6 =
 * Fixed:      #1432 - Theme check failing when double-slashes existed in get_template_directory() return.
 * Removed:    curlRead from helper class.

ReduxCore/framework.php

@@ -65,7 +65,7 @@ class ReduxFramework {
             // ATTENTION DEVS
             // Please update the build number with each push, no matter how small.
             // This will make for easier support when we ask users what version they are using.
-            public static $_version = '3.3.3.6';
+            public static $_version = '3.3.3.7';
             public static $_dir;
             public static $_url;
             public static $_upload_dir;

ReduxCore/inc/class.redux_helpers.php

@@ -57,15 +57,27 @@ public static function isFieldInUse( $parent, $field ) {
         }
 
         public static function isParentTheme( $file ) {
-            if ( strpos( self::cleanFilePath( $file ), self::cleanFilePath( get_template_directory() ) ) !== false ) {
+            $file   = self::cleanFilePath( $file );
+            $dir    = self::cleanFilePath( get_template_directory() );
+            
+            $file   = str_replace('//', '/', $file);
+            $dir    = str_replace('//', '/', $dir);
+            
+            if ( strpos( $file, $dir ) !== false ) {
                 return true;
             }
 
             return false;
         }
 
         public static function isChildTheme( $file ) {
-            if ( strpos( self::cleanFilePath( $file ), self::cleanFilePath( get_stylesheet_directory() ) ) !== false ) {
+            $file   = self::cleanFilePath( $file );
+            $dir    = self::cleanFilePath( get_stylesheet_directory() );
+            
+            $file   = str_replace('//', '/', $file);
+            $dir    = str_replace('//', '/', $dir);
+            
+            if ( strpos( $file, $dir ) !== false ) {
                 return true;
             }
 
@@ -120,7 +132,6 @@ public static function recursive_array_search( $needle, $haystack ) {
          */
         public static function cleanFilePath( $path ) {
             $path = str_replace( '', '', str_replace( array( "\\", "\\\\" ), '/', $path ) );
-            $path = str_replace('//', '/', $path);
 
             if ( $path[ strlen( $path ) - 1 ] === '/' ) {
                 $path = rtrim( $path, '/' );

class.redux-plugin.php

@@ -25,7 +25,7 @@ class ReduxFrameworkPlugin {
              * @const       string VERSION The plugin version, used for cache-busting and script file references
              * @since       3.0.0
              */
-            const VERSION = '3.3.3.6';
+            const VERSION = '3.3.3.7';
 
             /**
              * @access      protected

redux-framework.php

@@ -12,7 +12,7 @@
  * Description:     Redux is a simple, truly extensible options framework for WordPress themes and plugins.
  * Author:          Team Redux
  * Author URI:      http://reduxframework.com
- * Version:         3.3.3.6
+ * Version:         3.3.3.7
  * Text Domain:     redux-framework
  * License:         GPL3+
  * License URI:     http://www.gnu.org/licenses/gpl-3.0.txt