WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use absolute paths for includes. Props hakre. fixes #9750 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-05-12 16:47:49 +00:00
parent 99370b2b73
commit f5a6197172
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/install.php
View File

@ -14,11 +14,16 @@
*/ */
define('WP_INSTALLING', true); define('WP_INSTALLING', true);
/**
* This constant is used to include wp-load.php
*/
define('ABSPATH', dirname(dirname(__FILE__)).'/');
/** Load WordPress Bootstrap */ /** Load WordPress Bootstrap */
require_once('../wp-load.php'); require_once(ABSPATH . 'wp-load.php');
/** Load WordPress Administration Upgrade API */ /** Load WordPress Administration Upgrade API */
require_once('./includes/upgrade.php'); require_once(dirname(__FILE__) . '/includes/upgrade.php');
if (isset($_GET['step'])) if (isset($_GET['step']))
$step = $_GET['step']; $step = $_GET['step'];

20
wp-admin/setup-config.php
View File

@ -26,24 +26,24 @@ define('WPINC', 'wp-includes');
define('WP_CONTENT_DIR', ABSPATH . 'wp-content'); define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
/**#@-*/ /**#@-*/
require_once('../wp-includes/compat.php'); require_once(ABSPATH . WPINC . '/compat.php');
require_once('../wp-includes/functions.php'); require_once(ABSPATH . WPINC . '/functions.php');
require_once('../wp-includes/classes.php'); require_once(ABSPATH . WPINC . '/classes.php');
if (!file_exists('../wp-config-sample.php')) if (!file_exists(ABSPATH . 'wp-config-sample.php'))
wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
$configFile = file('../wp-config-sample.php'); $configFile = file(ABSPATH . 'wp-config-sample.php');
if ( !is_writable('../')) if ( !is_writable(ABSPATH))
wp_die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually."); wp_die("Sorry, I can't write to the directory. You'll have to either change the permissions on your WordPress directory or create your wp-config.php manually.");
// Check if wp-config.php has been created // Check if wp-config.php has been created
if (file_exists('../wp-config.php')) if (file_exists(ABSPATH . 'wp-config.php'))
wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>"); wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
// Check if wp-config.php exists above the root directory but is not part of another install // Check if wp-config.php exists above the root directory but is not part of another install
if (file_exists('../../wp-config.php') && ! file_exists('../../wp-settings.php')) if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>"); wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
if (isset($_GET['step'])) if (isset($_GET['step']))
@ -155,7 +155,7 @@ switch($step) {
if ( !empty($wpdb->error) ) if ( !empty($wpdb->error) )
wp_die($wpdb->error->get_error_message()); wp_die($wpdb->error->get_error_message());
$handle = fopen('../wp-config.php', 'w'); $handle = fopen(ABSPATH . 'wp-config.php', 'w');
foreach ($configFile as $line_num => $line) { foreach ($configFile as $line_num => $line) {
switch (substr($line,0,16)) { switch (substr($line,0,16)) {
@ -179,7 +179,7 @@ switch($step) {
} }
} }
fclose($handle); fclose($handle);
chmod('../wp-config.php', 0666); chmod(ABSPATH . 'wp-config.php', 0666);
display_header(); display_header();
?> ?>