Changeset 6137
- Timestamp:
- 09/19/2007 04:27:56 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/install.php
r6122 r6137 2 2 define('WP_INSTALLING', true); 3 3 if (!file_exists('../wp-config.php')) { 4 require_once('../wp-includes/compat.php'); 4 5 require_once('../wp-includes/functions.php'); 5 6 wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.", "WordPress › Error"); -
trunk/wp-admin/setup-config.php
r5001 r6137 2 2 define('WP_INSTALLING', true); 3 3 4 require_once('../wp-includes/compat.php'); 5 require_once('../wp-includes/functions.php'); 6 4 7 if (!file_exists('../wp-config-sample.php')) 5 die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');8 wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); 6 9 7 10 $configFile = file('../wp-config-sample.php'); 8 11 9 if (!is_writable('../')) 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."); 12 if ( !is_writable('../')) 13 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."); 10 14 15 // Check if wp-config.php has been created 16 if (file_exists('../wp-config.php')) 17 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>"); 11 18 12 19 if (isset($_GET['step'])) … … 14 21 else 15 22 $step = 0; 16 header( 'Content-Type: text/html; charset=utf-8' ); 23 24 function display_header(){ 25 header( 'Content-Type: text/html; charset=utf-8' ); 17 26 ?> 18 27 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> … … 77 86 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> 78 87 <?php 79 // Check if wp-config.php has been created 80 if (file_exists('../wp-config.php')) 81 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></body></html>"); 88 }//end function display_header(); 82 89 83 90 switch($step) { 84 91 case 0: 92 display_header(); 85 93 ?> 86 94 … … 99 107 100 108 case 1: 109 display_header(); 101 110 ?> 102 111 </p> … … 178 187 fclose($handle); 179 188 chmod('../wp-config.php', 0666); 189 190 display_header(); 180 191 ?> 181 192 <p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p> -
trunk/wp-includes/functions.php
r6110 r6137 1242 1242 1243 1243 if ( !function_exists('did_action') || !did_action('admin_head') ) : 1244 status_header(500); 1245 nocache_headers(); 1246 header('Content-Type: text/html; charset=utf-8'); 1244 if( !headers_sent() ){ 1245 status_header(500); 1246 nocache_headers(); 1247 header('Content-Type: text/html; charset=utf-8'); 1248 } 1247 1249 1248 1250 if ( empty($title) ){
Note: See TracChangeset
for help on using the changeset viewer.