Ticket #6938: allow-wp-content-directory-outside-of-webroot.patch

wp-includes/js/tinymce/tiny_mce_config.php

@@ -206 +206 @@
-}
-
-// Cache path, this is where the .gz files will be stored
-'wp-content
+WP_CONTENT_DIR . '
-if ( $disk_cache && ! is_dir($cache_path) )
-        $disk_cache = wp_mkdir_p($cache_path);
-

wp-includes/theme.php

@@ -333 +333 @@
-}
-
-function get_theme_root() {
-"wp-content
+WP_CONTENT_DIR . "
-}
-
-function get_theme_root_uri() {
-wp-content
+" . WP_CONTENT_DIR . "
-}
-
-function get_query_template($type) {

wp-includes/functions.php

@@ -1080 +1080 @@
-        $siteurl = get_option( 'siteurl' );
-        $upload_path = get_option( 'upload_path' );
-        if ( trim($upload_path) === '' )
-'wp-content
+WP_CONTENT_DIR . '
-        $dir = $upload_path;
-
-        // $dir is absolute, $path is (maybe) relative to ABSPATH
@@ -1558 +1558 @@
- */
-function require_wp_db() {
-        global $wpdb;
-'wp-content
-'wp-content
+WP_CONTENT_DIR . '
+WP_CONTENT_DIR . '
-        else
-                require_once( ABSPATH . WPINC . '/wp-db.php' );
-}
@@ -1568 +1568 @@
-        global $wpdb;
-
-        // Load custom DB error template, if present.
-'wp-content
-'wp-content
+WP_CONTENT_DIR . '
+WP_CONTENT_DIR . '
-                die();
-        }
-

wp-includes/comment-template.php

@@ -665 +665 @@
-        if ( file_exists( $include ) )
-                require( $include );
-        else
-'wp-content
+WP_CONTENT_DIR . '
-}
-
-/**

wp-includes/general-template.php

@@ -7 +7 @@
-        if ( file_exists( TEMPLATEPATH . '/header.php') )
-                load_template( TEMPLATEPATH . '/header.php');
-        else
-'wp-content
+WP_CONTENT_DIR . '
-}
-
-
@@ -16 +16 @@
-        if ( file_exists( TEMPLATEPATH . '/footer.php') )
-                load_template( TEMPLATEPATH . '/footer.php');
-        else
-'wp-content
+WP_CONTENT_DIR . '
-}
-
-
@@ -27 +27 @@
-        elseif ( file_exists( TEMPLATEPATH . '/sidebar.php') )
-                load_template( TEMPLATEPATH . '/sidebar.php');
-        else
-'wp-content
+WP_CONTENT_DIR . '
-}
-
-

wp-includes/rss.php

@@ -651 +651 @@
-}
-
-class RSSCache {
-'wp-content
+WP_CONTENT_DIR . '
-        var $MAX_AGE    = 43200;                // when are files stale, default twelve hours
-        var $ERROR              = '';                   // accumulate error messages
-

wp-settings.php

@@ -100 +100 @@
-        die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.3.' );
-}
-
-
+
+
+
+
+
-        die( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' );
-
-/**
@@ -166 +170 @@
-
-// For an advanced caching plugin to use, static because you would only want one
-if ( defined('WP_CACHE') )
-'wp-content
+WP_CONTENT_DIR . '
-
-/**
- * Stores the location of the WordPress directory of functions, classes, and core content.
@@ -182 +186 @@
-         *
-         * @since 2.1.0
-         */
-ABSPATH . 'wp-content/languages') && @is_dir(ABSPATH . 'wp-content
-'wp-content
+WP_CONTENT_DIR . '/languages') && @is_dir(WP_CONTENT_DIR . '
+WP_CONTENT_DIR . '
-        else
-                define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash
-}
@@ -197 +201 @@
- * @since 2.1
- */
-if ( !defined('PLUGINDIR') )
-'wp-content
+WP_CONTENT_DIR . '
-
-require (ABSPATH . WPINC . '/compat.php');
-require (ABSPATH . WPINC . '/functions.php');
@@ -213 +217 @@
-if ( is_wp_error($prefix) )
-        wp_die('<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.');
-
-'wp-content
-'wp-content
+WP_CONTENT_DIR . '
+WP_CONTENT_DIR . '
-else
-        require_once (ABSPATH . WPINC . '/cache.php');
-

wp-admin/includes/schema.php

@@ -226 +226 @@
-        if ( ini_get('safe_mode') ) {
-                // Safe mode screws up mkdir(), so we must use a flat structure.
-                add_option('uploads_use_yearmonth_folders', 0);
-'wp-content'
+WP_CONTENT_DIR
-        } else {
-                add_option('uploads_use_yearmonth_folders', 1);
-'wp-content
+WP_CONTENT_DIR . '
-        }
-
-        // 2.0.3

wp-admin/includes/file.php

@@ -46 +46 @@
-        if ( defined('WP_TEMP_DIR') )
-                return trailingslashit(WP_TEMP_DIR);
-
-'wp-content
+WP_CONTENT_DIR . '
-        if ( is_dir($temp) && is_writable($temp) )
-                return $temp;
-

wp-admin/includes/update.php

@@ -179 +179 @@
-        if ( is_wp_error($file) )
-                return new WP_Error('download_failed', __('Download failed.'), $file->get_error_message());
-
-'wp-content
+WP_CONTENT_DIR . '
-
-        // Clean up working directory
-        if ( $wp_filesystem->is_dir($working_dir) )

wp-admin/includes/upgrade.php

@@ -1 +1 @@
-<?php
-
-'wp-content
-'wp-content
+WP_CONTENT_DIR . '
+WP_CONTENT_DIR . '
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
-
@@ -1077 +1077 @@
-
-function make_site_theme_from_oldschool($theme_name, $template) {
-        $home_path = get_home_path();
-"wp-content
+WP_CONTENT_DIR . "
-
-        if (! file_exists("$home_path/index.php"))
-                return false;
@@ -1096 +1096 @@
-                if ($oldfile == 'index.php') { // Check to make sure it's not a new index
-                        $index = implode('', file("$oldpath/$oldfile"));
-                        if (strpos($index, 'WP_USE_THEMES') !== false) {
-'wp-content
+WP_CONTENT_DIR . '
-                                        return false;
-                                continue; // Don't copy anything
-                                }
@@ -1144 +1144 @@
-}
-
-function make_site_theme_from_default($theme_name, $template) {
-"wp-content
-'wp-content
+WP_CONTENT_DIR . "
+WP_CONTENT_DIR . '
-
-        // Copy files from the default theme to the site theme.
-        //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
@@ -1202 +1202 @@
-        // Name the theme after the blog.
-        $theme_name = __get_option('blogname');
-        $template = sanitize_title($theme_name);
-"wp-content
+WP_CONTENT_DIR . "
-
-        // If the theme already exists, nothing to do.
-        if ( is_dir($site_dir)) {
@@ -1210 +1210 @@
-        }
-
-        // We must be able to write to the themes dir.
-"wp-content
+WP_CONTENT_DIR . "
-                return false;
-        }
-

wp-admin/import/mt.php

@@ -179 +179 @@
-
-        function select_authors() {
-                if ( $_POST['upload_type'] === 'ftp' ) {
-'wp-content
+WP_CONTENT_DIR . '
-                        if ( !file_exists($file['file']) )
-                                $file['error'] = __('<code>mt-export.txt</code> does not exist');
-                } else {
@@ -426 +426 @@
-        function import() {
-                $this->id = (int) $_GET['id'];
-                if ( $this->id == 0 )
-'wp-content
+WP_CONTENT_DIR . '
-                else
-                        $this->file = get_attached_file($this->id);
-                $this->get_authors_from_post();