WordPress.org

Make WordPress Core

Changeset 12268


Ignore:
Timestamp:
11/23/09 21:52:13 (4 years ago)
Author:
ryan
Message:

Fix wpfs root dir location. Props dd32. fixes #11152

Location:
trunk/wp-admin/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

    r11934 r12268  
    8383        //Set the Connection to use Passive FTP 
    8484        @ftp_pasv( $this->link, true ); 
    85         if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FTP_TIMEOUT ) 
    86             @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FTP_TIMEOUT); 
     85        if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT ) 
     86            @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT); 
    8787 
    8888        return true; 
  • trunk/wp-admin/includes/file.php

    r12152 r12268  
    739739    } 
    740740 
    741     if ( defined('FTP_SSH') || (defined('FS_METHOD') && 'ssh' == FS_METHOD) ) 
     741    if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) ) 
    742742        $credentials['connection_type'] = 'ssh'; 
    743     else if ( defined('FTP_SSL') && 'ftpext' == $type ) //Only the FTP Extension understands SSL 
     743    else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL 
    744744        $credentials['connection_type'] = 'ftps'; 
    745745    else if ( !empty($_POST['connection_type']) ) 
     
    838838<?php 
    839839 
    840     $disabled = defined('FTP_SSL') || defined('FTP_SSH') ? '' : ' disabled="disabled"'; 
     840    $disabled = (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH) ? ' disabled="disabled"' : ''; 
    841841 
    842842    foreach ( $types as $name => $text ) : ?> 
Note: See TracChangeset for help on using the changeset viewer.