Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1536262 by sun: Fixed entering a site name when installing Drupal 8 has no effect until caches are cleared.

8.0.x
catch 2012-04-24 11:15:56 +09:00
parent 7642d2466b
commit b7cae658e0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/includes/bootstrap.inc
View File

@ -1760,7 +1760,7 @@ function drupal_is_denied($ip) {
// won't be denied. However the user asked explicitly not to use the // 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 // database and also in this case it's quite likely that the user relies
// on higher performance solutions like a firewall. // 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(); $denied = (bool)db_query("SELECT 1 FROM {blocked_ips} WHERE ip = :ip", array(':ip' => $ip))->fetchField();
} }
return $denied; return $denied;

2
core/includes/theme.maintenance.inc
View File

@ -38,7 +38,7 @@ function _drupal_maintenance_theme() {
// The bootstrap was not complete. So we are operating in a crippled // The bootstrap was not complete. So we are operating in a crippled
// environment, we need to bootstrap just enough to allow hook invocations // environment, we need to bootstrap just enough to allow hook invocations
// to work. See _drupal_log_error(). // 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'; require_once DRUPAL_ROOT . '/core/includes/database.inc';
} }

10
core/lib/Drupal/Core/Cache/InstallBackend.php
View File

@ -57,7 +57,7 @@ class InstallBackend extends DatabaseBackend {
*/ */
function delete($cid) { function delete($cid) {
try { try {
if (class_exists('Database')) { if (class_exists('Drupal\Core\Database\Database')) {
parent::delete($cid); parent::delete($cid);
} }
} }
@ -69,7 +69,7 @@ class InstallBackend extends DatabaseBackend {
*/ */
function deleteMultiple(array $cids) { function deleteMultiple(array $cids) {
try { try {
if (class_exists('Database')) { if (class_exists('Drupal\Core\Database\Database')) {
parent::deleteMultiple($cids); parent::deleteMultiple($cids);
} }
} }
@ -81,7 +81,7 @@ class InstallBackend extends DatabaseBackend {
*/ */
function deletePrefix($prefix) { function deletePrefix($prefix) {
try { try {
if (class_exists('Database')) { if (class_exists('Drupal\Core\Database\Database')) {
parent::deletePrefix($prefix); parent::deletePrefix($prefix);
} }
} }
@ -90,7 +90,7 @@ class InstallBackend extends DatabaseBackend {
function invalidateTags(array $tags) { function invalidateTags(array $tags) {
try { try {
if (class_exists('Database')) { if (class_exists('Drupal\Core\Database\Database')) {
parent::invalidateTags($tags); parent::invalidateTags($tags);
} }
} }
@ -102,7 +102,7 @@ class InstallBackend extends DatabaseBackend {
*/ */
function flush() { function flush() {
try { try {
if (class_exists('Database')) { if (class_exists('Drupal\Core\Database\Database')) {
parent::flush(); parent::flush();
} }
} }