From b7cae658e006529e1e4c46bec10adca51da02522 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 24 Apr 2012 11:15:56 +0900
Subject: [PATCH] Issue #1536262 by sun: Fixed entering a site name when
 installing Drupal 8 has no effect until caches are cleared.

---
 core/includes/bootstrap.inc                   |  2 +-
 core/includes/theme.maintenance.inc           |  2 +-
 core/lib/Drupal/Core/Cache/InstallBackend.php | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 7dd33b59207..8c311c0c2dd 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1760,7 +1760,7 @@ function drupal_is_denied($ip) {
   // won't be denied. However the user asked explicitly not to use the
   // database and also in this case it's quite likely that the user relies
   // on higher performance solutions like a firewall.
-  elseif (class_exists('Database', FALSE)) {
+  elseif (class_exists('Drupal\Core\Database\Database', FALSE)) {
     $denied = (bool)db_query("SELECT 1 FROM {blocked_ips} WHERE ip = :ip", array(':ip' => $ip))->fetchField();
   }
   return $denied;
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index 3fd60c96593..a2d6870cdd1 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -38,7 +38,7 @@ function _drupal_maintenance_theme() {
     // The bootstrap was not complete. So we are operating in a crippled
     // environment, we need to bootstrap just enough to allow hook invocations
     // to work. See _drupal_log_error().
-    if (!class_exists('Database', FALSE)) {
+    if (!class_exists('Drupal\Core\Database\Database', FALSE)) {
       require_once DRUPAL_ROOT . '/core/includes/database.inc';
     }
 
diff --git a/core/lib/Drupal/Core/Cache/InstallBackend.php b/core/lib/Drupal/Core/Cache/InstallBackend.php
index f332fcc9101..086109004b7 100644
--- a/core/lib/Drupal/Core/Cache/InstallBackend.php
+++ b/core/lib/Drupal/Core/Cache/InstallBackend.php
@@ -57,7 +57,7 @@ class InstallBackend extends DatabaseBackend {
    */
   function delete($cid) {
     try {
-      if (class_exists('Database')) {
+      if (class_exists('Drupal\Core\Database\Database')) {
         parent::delete($cid);
       }
     }
@@ -69,7 +69,7 @@ class InstallBackend extends DatabaseBackend {
    */
   function deleteMultiple(array $cids) {
     try {
-      if (class_exists('Database')) {
+      if (class_exists('Drupal\Core\Database\Database')) {
         parent::deleteMultiple($cids);
       }
     }
@@ -81,7 +81,7 @@ class InstallBackend extends DatabaseBackend {
    */
   function deletePrefix($prefix) {
     try {
-      if (class_exists('Database')) {
+      if (class_exists('Drupal\Core\Database\Database')) {
         parent::deletePrefix($prefix);
       }
     }
@@ -90,7 +90,7 @@ class InstallBackend extends DatabaseBackend {
 
   function invalidateTags(array $tags) {
     try {
-      if (class_exists('Database')) {
+      if (class_exists('Drupal\Core\Database\Database')) {
         parent::invalidateTags($tags);
       }
     }
@@ -102,7 +102,7 @@ class InstallBackend extends DatabaseBackend {
    */
   function flush() {
     try {
-      if (class_exists('Database')) {
+      if (class_exists('Drupal\Core\Database\Database')) {
         parent::flush();
       }
     }