Merge remote-tracking branch 'origin/11.0' into 11.x

pimcore · Mar 15, 2024 · c19fc36 · c19fc36
2 parents c6b89f0 + 041376c
commit c19fc36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/public/index.php b/public/index.php
@@ -19,14 +19,14 @@
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
 Bootstrap::setProjectRoot();
-Bootstrap::bootstrap();
 
 return function (Request $request, array $context) {
 
     // set current request as property on tool as there's no
     // request stack available yet
     Tool::setCurrentRequest($request);
 
+    Bootstrap::bootstrap();
     $kernel = Bootstrap::kernel();
 
     // reset current request - will be read from request stack from now on

diff --git a/templates/default/default.html.twig b/templates/default/default.html.twig
@@ -108,8 +108,8 @@
 
     {% if editmode %}
         <div class="buttons">
-            <a target="_blank" href="https://pimcore.com/docs/6.x/Development_Documentation/Getting_Started/Installation.html">Install Sample Data / Boilerplate</a>
-            <a target="_blank" href="https://pimcore.com/docs/6.x/Development_Documentation/Getting_Started/index.html">Getting Started</a>
+            <a target="_blank" href="https://pimcore.com/docs/platform/Pimcore/Getting_Started/Installation/Webserver_Installation">Install Sample Data / Boilerplate</a>
+            <a target="_blank" href="https://pimcore.com/docs/platform/Pimcore/Getting_Started">Getting Started</a>
         </div>
 
         <div class="info">