Commit b7cae658 authored by catch's avatar catch

Issue #1536262 by sun: Fixed entering a site name when installing Drupal 8 has...

Issue #1536262 by sun: Fixed entering a site name when installing Drupal 8 has no effect until caches are cleared.
parent 7642d246
......@@ -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;
......
......@@ -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';
}
......
......@@ -57,7 +57,7 @@ function set($cid, $data, $expire = CACHE_PERMANENT, array $tags = array()) {}
*/
function delete($cid) {
try {
if (class_exists('Database')) {
if (class_exists('Drupal\Core\Database\Database')) {
parent::delete($cid);
}
}
......@@ -69,7 +69,7 @@ function delete($cid) {
*/
function deleteMultiple(array $cids) {
try {
if (class_exists('Database')) {
if (class_exists('Drupal\Core\Database\Database')) {
parent::deleteMultiple($cids);
}
}
......@@ -81,7 +81,7 @@ function deleteMultiple(array $cids) {
*/
function deletePrefix($prefix) {
try {
if (class_exists('Database')) {
if (class_exists('Drupal\Core\Database\Database')) {
parent::deletePrefix($prefix);
}
}
......@@ -90,7 +90,7 @@ function deletePrefix($prefix) {
function invalidateTags(array $tags) {
try {
if (class_exists('Database')) {
if (class_exists('Drupal\Core\Database\Database')) {
parent::invalidateTags($tags);
}
}
......@@ -102,7 +102,7 @@ function invalidateTags(array $tags) {
*/
function flush() {
try {
if (class_exists('Database')) {
if (class_exists('Drupal\Core\Database\Database')) {
parent::flush();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment