summaryrefslogtreecommitdiffstats
path: root/core/authorize.php
diff options
context:
space:
mode:
authorNathaniel Catchpole2014-01-28 13:07:47 (GMT)
committerNathaniel Catchpole2014-01-28 13:07:47 (GMT)
commite373ebee3490120b13fb4062f37b9565e3b2474d (patch)
treeb85a3273b836c55d825071bd20efcc937adfc2b7 /core/authorize.php
parent856d6e14707b074fc78fef5d84020eaa2f4976b1 (diff)
Issue #2167109 by Berdir, sun, alexpott, ACF, acrollet, adamdicarlo, Albert Volkman, andreiashu, andyceo, andypost, anenkov, aspilicious, barbun, beejeebus, boombatower, cam8001, chriscalip, chx, cosmicdreams, dagmar, damiankloip, dawehner, deviance, disasm, dixon_, dstol, ebrowet, Gábor Hojtsy, heyrocker, Hydra, ianthomas_uk, japicoder, jcisio, jibran, julien, justafish, jvns, KarenS, kbasarab, kim.pepper, larowlan, Lars Toomre, leschekfm, Letharion, LinL, lirantal, Lukas von Blarer, marcingy, Mike Wacker, mrf, mtift, mtunay, n3or, nadavoid, nick_schuch, Niklas Fiekas, ParisLiakos, pcambra, penyaskito, pfrenssen, plopesc, Pol, Rok Žlender, rvilar, swentel, tim.plunkett, tobiasb, tsvenson, typhonius, vasi1186, vijaycs85, wamilton, webchick, webflo, wizonesolutions, xjm, yched, YesCT, znerol: Remove Variable subsystem.
Diffstat (limited to 'core/authorize.php')
-rw-r--r--core/authorize.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/core/authorize.php b/core/authorize.php
index ecb7e22..fd9e2f4 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -69,15 +69,9 @@ require_once __DIR__ . '/includes/file.inc';
require_once __DIR__ . '/includes/module.inc';
require_once __DIR__ . '/includes/ajax.inc';
-// We prepare only a minimal bootstrap. This includes the database and
-// variables, however, so we have access to the class autoloader.
-drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
-
-$request = Request::createFromGlobals();
-\Drupal::getContainer()->set('request', $request);
-
-// This must go after drupal_bootstrap(), which unsets globals!
-global $conf;
+// Prepare a minimal bootstrap.
+drupal_bootstrap(DRUPAL_BOOTSTRAP_PAGE_CACHE);
+$request = \Drupal::request();
// We have to enable the user and system modules, even to check access and
// display errors via the maintenance theme.