Skip to content

Commit 72f9ff6

Browse files
committed
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
1 parent 4c65eff commit 72f9ff6

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

wp-settings.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,13 @@ function timer_start() {
6161
require_once (ABSPATH . WPINC . '/wp-l10n.php');
6262

6363
$wpdb->hide_errors();
64-
if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') )
65-
die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
64+
if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) {
65+
if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
66+
$link = 'install.php';
67+
else
68+
$link = 'wp-admin/install.php';
69+
die("It doesn't look like you've installed WP yet. Try running <a href='$link'>install.php</a>.");
70+
}
6671
$wpdb->show_errors();
6772

6873
require (ABSPATH . WPINC . '/functions-formatting.php');

0 commit comments

Comments
 (0)