From 8e03de3d4f968d73daa7f3419adac937620e52bc Mon Sep 17 00:00:00 2001
From: scribu <mail@scribu.net>
Date: Thu, 9 May 2013 23:23:58 +0300
Subject: [PATCH] define WP_DEBUG in Utils\wp_debug_mode()

---
 php/WP_CLI/Runner.php | 7 -------
 php/utils-wp.php      | 3 +++
 php/wp-cli.php        | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
index 4af9554e..fba607ae 100644
--- a/php/WP_CLI/Runner.php
+++ b/php/WP_CLI/Runner.php
@@ -335,13 +335,6 @@ class Runner {
 		}
 	}
 
-	public function after_wp_config_load() {
-		if ( $this->config['debug'] ) {
-			if ( !defined( 'WP_DEBUG' ) )
-				define( 'WP_DEBUG', true );
-		}
-	}
-
 	public function after_wp_load() {
 		add_filter( 'filesystem_method', function() { return 'direct'; }, 99 );
 
diff --git a/php/utils-wp.php b/php/utils-wp.php
index 1821f7f8..a50be471 100644
--- a/php/utils-wp.php
+++ b/php/utils-wp.php
@@ -14,6 +14,9 @@ function wp_not_installed() {
 
 function wp_debug_mode() {
 	if ( \WP_CLI::get_config( 'debug' ) ) {
+		if ( !defined( 'WP_DEBUG' ) )
+			define( 'WP_DEBUG', true );
+
 		error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
 		ini_set( 'display_errors', true );
 	} else {
diff --git a/php/wp-cli.php b/php/wp-cli.php
index f002341c..74db4137 100644
--- a/php/wp-cli.php
+++ b/php/wp-cli.php
@@ -20,8 +20,6 @@ WP_CLI::$runner->before_wp_load();
 // Load wp-config.php code, in the global scope
 eval( WP_CLI::$runner->get_wp_config_code() );
 
-WP_CLI::$runner->after_wp_config_load();
-
 // Simulate a /wp-admin/ page load
 $_SERVER['PHP_SELF'] = '/wp-admin/index.php';
 define( 'WP_ADMIN', true );
-- 
2.11.0