Merge origin/master

Author: kprovance

README.md

@@ -78,6 +78,10 @@ Send me an email at [email protected] so I can add you to our user sp
 
 ### Master ###
 
+= 3.3.3.8 =
+* Fixed:      Issues with file writing. Basically many users don't install WordPress with all the permissions
+              correct. So... Had to move it back to /uploads/. Sorry Otto, that's just how it is.
+
 = 3.3.3.7 =
 * Fixed:      #1440 - flaw in new cleanFilePath logic.
 

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.7';
+            public static $_version = '3.3.3.8';
             public static $_dir;
             public static $_url;
             public static $_upload_dir;
@@ -346,8 +346,8 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
             } // __construct()
 
             private function set_redux_content() {
-                self::$_upload_dir = Redux_Helpers::cleanFilePath(trailingslashit( WP_CONTENT_DIR )) . '/redux/';
-                self::$_upload_url = Redux_Helpers::cleanFilePath(trailingslashit( content_url() )) . '/redux/';
+                self::$_upload_dir = Redux_Helpers::cleanFilePath(trailingslashit( WP_CONTENT_DIR )) . '/uploads/redux/';
+                self::$_upload_url = Redux_Helpers::cleanFilePath(trailingslashit( content_url() )) . '/uploads/redux/';
 
                 if ( ! is_dir( self::$_upload_dir ) ) {
                     // Create the directory

ReduxCore/inc/class.redux_filesystem.php

@@ -46,8 +46,12 @@ public function execute($action, $file, $params = '') {
                 if (!is_admin()) {
                     return;
                 }
-                
-                request_filesystem_credentials($url, '', true, false);
+                // Never load this unless we're on the panel page.
+                if ( is_admin() && isset( $_GET['page'] ) && $_GET['page'] == $this->parent->args['page_slug'] ) {
+                    $creds = request_filesystem_credentials($url, '', false, false);    
+                } else {
+                    return;
+                }
                 return true;
             }   
 
@@ -73,4 +77,4 @@ public function execute($action, $file, $params = '') {
             return $res;
         }
     }
-}
+}

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.7
+ * Version:         3.3.3.8
  * Text Domain:     redux-framework
  * License:         GPL3+
  * License URI:     http://www.gnu.org/licenses/gpl-3.0.txt