Changes in trunk/wp-admin/includes/file.php [12152:12310]

File:

• trunk/wp-admin/includes/file.php (modified) (4 diffs)

trunk/wp-admin/includes/file.php

@@ -196 +196 @@
  */
 function validate_file_to_edit( $file, $allowed_files = '' ) {
-        $file = stripslashes( $file );
-
         $code = validate_file( $file, $allowed_files );
 
@@ -207 +205 @@
                         wp_die( __('Sorry, can’t edit files with “..” in the name. If you are trying to edit a file in your WordPress home directory, you can just type the name of the file in.' ));
 
-                case 2 :
-                        wp_die( __('Sorry, can’t call files with their real path.' ));
+                //case 2 :
+                //      wp_die( __('Sorry, can’t call files with their real path.' ));
 
                 case 3 :
@@ -739 +737 @@
         }
 
-        if ( defined('FTP_SSH') || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
+        if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
                 $credentials['connection_type'] = 'ssh';
-        else if ( defined('FTP_SSL') && 'ftpext' == $type ) //Only the FTP Extension understands SSL
+        else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
                 $credentials['connection_type'] = 'ftps';
         else if ( !empty($_POST['connection_type']) )
@@ -838 +836 @@
 <?php
 
-        $disabled = defined('FTP_SSL') || defined('FTP_SSH') ? '' : ' disabled="disabled"';
+        $disabled = (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH) ? ' disabled="disabled"' : '';
 
         foreach ( $types as $name => $text ) : ?>