- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/class-wp-filesystem-base.php
r14810 r18268 22 22 var $verbose = false; 23 23 /** 24 * Cached list of local filepaths to map ed remote filepaths.24 * Cached list of local filepaths to mapped remote filepaths. 25 25 * 26 26 * @since 2.7 … … 83 83 */ 84 84 function wp_themes_dir() { 85 return $this->wp_content_dir() . '/themes'; 85 return $this->wp_content_dir() . 'themes/'; 86 } 87 /** 88 * Returns the path on the remote filesystem of WP_LANG_DIR 89 * 90 * @since 3.2.0 91 * @access public 92 * 93 * @return string The location of the remote path. 94 */ 95 function wp_lang_dir() { 96 return $this->find_folder(WP_LANG_DIR); 86 97 } 87 98 … … 138 149 139 150 if ( strpos($this->method, 'ftp') !== false ) { 140 $constant_overrides = array( 'FTP_BASE' => ABSPATH, 'FTP_CONTENT_DIR' => WP_CONTENT_DIR, 'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR );151 $constant_overrides = array( 'FTP_BASE' => ABSPATH, 'FTP_CONTENT_DIR' => WP_CONTENT_DIR, 'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR, 'FTP_LANG_DIR' => WP_LANG_DIR ); 141 152 foreach ( $constant_overrides as $constant => $dir ) 142 153 if ( defined($constant) && $folder === $dir ) … … 205 216 } 206 217 207 //Only check this as a last resort, to prevent locating the incorrect install. All above proce eedures will fail quickly if this is the right branch to take.218 //Only check this as a last resort, to prevent locating the incorrect install. All above procedures will fail quickly if this is the right branch to take. 208 219 if (isset( $files[ $last_path ] ) ) { 209 220 if ( $this->verbose ) … … 212 223 } 213 224 if ( $loop ) 214 return false; //Prevent t ihs functionlooping again.225 return false; //Prevent this function from looping again. 215 226 //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups. 216 227 return $this->search_for_folder($folder, '/', true);
Note: See TracChangeset
for help on using the changeset viewer.