Fix some php "Uncaught Error" when user is missing an extension

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 9, 2020 · 84cd7fb · 84cd7fb
1 parent df55e04
commit 84cd7fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
@@ -63,7 +63,7 @@ public function __construct()
         $config = $GLOBALS['PMA_Config'];
         if (static::$twig === null) {
             $loader = new FilesystemLoader(self::BASE_PATH);
-            $cache_dir = $config->getTempDir('twig');
+            $cache_dir = $config !== null ? $config->getTempDir('twig') : null;
             /* Twig expects false when cache is not configured */
             if ($cache_dir === null) {
                 $cache_dir = false;

diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
@@ -216,7 +216,9 @@ public static function getCommonRaw($params = [], $divider = '?')
             $params['server'] = $GLOBALS['server'];
         }
 
-        if (empty($PMA_Config->getCookie('pma_lang')) && ! empty($GLOBALS['lang'])) {
+        // Can be null when the user is missing an extension.
+        // See: Core::checkExtensions()
+        if ($PMA_Config !== null && empty($PMA_Config->getCookie('pma_lang')) && ! empty($GLOBALS['lang'])) {
             $params['lang'] = $GLOBALS['lang'];
         }