Skip to content

Commit

Permalink
BUGFIX #7018 This stops an infinite loop when Depreciation::notice is…
Browse files Browse the repository at this point in the history
… called from set_dev_servers(). This doesn't stop people from setting $dev_servers directly (not that it is used in the core code anywhere).
  • Loading branch information
garethbfoster committed Mar 24, 2012
1 parent ee2f196 commit 21d52d3
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions control/Director.php
Expand Up @@ -814,10 +814,6 @@ static function isDev($dontTouchDB = false) {
if(isset($_SESSION['isDev']) && $_SESSION['isDev']) $result = true;
if(self::$environment_type && self::$environment_type == 'dev') $result = true;

if(!empty(Director::$dev_servers)) {
Deprecation::notice('3.0', 'Director::$dev_servers doesn\'t work anymore');
}

// Use ?isDev=1 to get development access on the live server
if(!$dontTouchDB && !$result && isset($_GET['isDev'])) {
if(Security::database_is_ready()) {
Expand Down

0 comments on commit 21d52d3

Please sign in to comment.