Don't gettext before l10n bits are loaded. Props nbachiyski. fixes #3590
git-svn-id: https://develop.svn.wordpress.org/trunk@4756 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
ebc82b1be2
commit
ad899d26e0
@ -103,7 +103,7 @@ else
|
|||||||
$wpdb->prefix = $table_prefix;
|
$wpdb->prefix = $table_prefix;
|
||||||
|
|
||||||
if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') )
|
if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) && !file_exists(ABSPATH . 'wp-content/db.php') )
|
||||||
die(__('<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'));
|
die("<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.");
|
||||||
|
|
||||||
// Table names
|
// Table names
|
||||||
$wpdb->posts = $wpdb->prefix . 'posts';
|
$wpdb->posts = $wpdb->prefix . 'posts';
|
||||||
@ -146,7 +146,7 @@ if ( !is_blog_installed() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !d
|
|||||||
$link = 'install.php';
|
$link = 'install.php';
|
||||||
else
|
else
|
||||||
$link = 'wp-admin/install.php';
|
$link = 'wp-admin/install.php';
|
||||||
wp_die(sprintf(__("It doesn't look like you've installed WP yet. Try running <a href='%s'>install.php</a>."), $link));
|
wp_die(sprintf("It doesn't look like you've installed WP yet. Try running <a href='%s'>install.php</a>.", $link));
|
||||||
}
|
}
|
||||||
|
|
||||||
require (ABSPATH . WPINC . '/formatting.php');
|
require (ABSPATH . WPINC . '/formatting.php');
|
||||||
|
Loading…
Reference in New Issue
Block a user