Fallback to disabled cache in case template loading fails

Fixes #13238 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · May 5, 2017 · e852abc · e852abc
1 parent 92a1e5a
commit e852abc
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/libraries/Template.php b/libraries/Template.php
@@ -174,8 +174,26 @@ public function render($data = array(), $helperFunctions = array())
 
         if (file_exists($template . '.twig')) {
             $this->set($data);
-            return $this->twig->load($this->name . '.twig')
-                ->render($this->data);
+            try {
+                $template = $this->twig->load($this->name . '.twig');
+            } catch (\RuntimeException $e) {
+                /* Retry with disabled cache */
+                $this->twig->setCache(false);
+                $template = $this->twig->load($this->name . '.twig');
+                /*
+                 * The trigger error is intentionally after second load
+                 * to avoid triggering error when disabling cache does not
+                 * solve it.
+                 */
+                trigger_error(
+                    sprintf(
+                        __('Error while working with template cache: %s'),
+                        $e->getMessage()
+                    ),
+                    E_USER_WARNING
+                );
+            }
+            return $template->render($this->data);
         }
 
         $template = $template . '.phtml';