From 72f9ff6ec00aa14bdd7d1cae6f8f4ffd3607067a Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Mon, 31 Jan 2005 10:28:53 +0000 Subject: [PATCH] If we're already in wp-admin don't recursive link git-svn-id: https://develop.svn.wordpress.org/trunk@2171 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-settings.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index d99487dde7..af4daf4a54 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -61,8 +61,13 @@ require (ABSPATH . WPINC . '/functions.php'); require_once (ABSPATH . WPINC . '/wp-l10n.php'); $wpdb->hide_errors(); -if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) - die("It doesn't look like you've installed WP yet. Try running install.php."); +if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) { + if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) + $link = 'install.php'; + else + $link = 'wp-admin/install.php'; + die("It doesn't look like you've installed WP yet. Try running install.php."); +} $wpdb->show_errors(); require (ABSPATH . WPINC . '/functions-formatting.php');