Ticket #23680: 23680-2.diff

wp-admin/includes/deprecated.php

@@ -1023 +1023 @@
         _deprecated_function( __FUNCTION__, '3.5', 'image_resize()' );
         return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
 }
+
+/**
+ * Get the real file system path to a file to edit within the admin
+ *
+ * If the $file is index.php or .htaccess this function will assume it is relative
+ * to the install root, otherwise it is assumed the file is relative to the wp-content
+ * directory
+ *
+ * @since 1.5.0
+ * @deprecated 2.9
+ * @uses get_home_path
+ * @uses WP_CONTENT_DIR full filesystem path to the wp-content directory
+ * @param string $file filesystem path relative to the WordPress install directory or to the wp-content directory
+ * @return string full file system path to edit
+ */
+function get_real_file_to_edit( $file ) {
+        _deprecated_function( __FUNCTION__, '2.9' );
+
+        return WP_CONTENT_DIR . $file;
+}
+ No newline at end of file

wp-admin/includes/file.php

@@ -93 +93 @@
         return str_replace( '\\', '/', $home_path );
 }
 
-/**
- * Get the real file system path to a file to edit within the admin
- *
- * If the $file is index.php or .htaccess this function will assume it is relative
- * to the install root, otherwise it is assumed the file is relative to the wp-content
- * directory
- *
- * @since 1.5.0
- * @deprecated 2.9
- * @uses get_home_path
- * @uses WP_CONTENT_DIR full filesystem path to the wp-content directory
- * @param string $file filesystem path relative to the WordPress install directory or to the wp-content directory
- * @return string full file system path to edit
- */
-function get_real_file_to_edit( $file ) {
-        _deprecated_function( __FUNCTION__, '2.9' );
-
-        if ('index.php' == $file || '.htaccess' == $file ) {
-                $real_file = get_home_path() . $file;
-        } else {
-                $real_file = WP_CONTENT_DIR . $file;
-        }
-
-        return $real_file;
-}
 
 /**
  * Returns a listing of all files in the specified folder and all subdirectories up to 100 levels deep.