Merge branch 'QA_5_0'

phpmyadmin · Sep 21, 2019 · 6ea135a · 6ea135a
2 parents e222cb8 + 3e330fd
commit 6ea135a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
@@ -317,7 +317,7 @@ private function getHtmlForGotoPage(?array $foreignData): string
     {
         $gotopage = '';
         isset($_POST['pos']) ? $pos = $_POST['pos'] : $pos = 0;
-        if (! is_array($foreignData['disp_row'])) {
+        if ($foreignData === null || ! is_array($foreignData['disp_row'])) {
             return $gotopage;
         }
 

diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
@@ -852,11 +852,11 @@ private function _getAndOrColCell(
             $html_output .= '<strong>' . __('Or:') . '</strong>';
             $html_output .= '<input type="radio"'
                 . ' name="criteriaAndOrColumn[' . $column_number . ']"'
-                . ' value="or"' . $selected['or'] . '>';
+                . ' value="or"' . ($selected['or'] ?? '') . '>';
             $html_output .= '&nbsp;&nbsp;<strong>' . __('And:') . '</strong>';
             $html_output .= '<input type="radio"'
                 . ' name="criteriaAndOrColumn[' . $column_number . ']"'
-                . ' value="and"' . $selected['and'] . '>';
+                . ' value="and"' . ($selected['and'] ?? '') . '>';
         }
         $html_output .= '<br>' . __('Ins');
         $html_output .= '<input type="checkbox"'

diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php
@@ -1077,7 +1077,7 @@ private function findDistinctValuesCount(array $columns, $table)
         $res = $this->dbi->fetchResult($query, null, null);
         foreach ($columns as $column) {
             if ($column) {
-                $result[$column] = $res[0][$column . '_cnt'];
+                $result[$column] = $res[0][$column . '_cnt'] ?? null;
             }
         }
         return $result;

diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -400,7 +400,7 @@ public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
 
         $columns = $GLOBALS['dbi']->getColumns($db, $view);
         foreach ($columns as $column) {
-            $col_as = $column['Field'];
+            $col_as = $column['Field'] ?? null;
             if (! empty($aliases[$db]['tables'][$view]['columns'][$col_as])) {
                 $col_as = $aliases[$db]['tables'][$view]['columns'][$col_as];
             }

diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php
@@ -296,7 +296,7 @@ public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
 
         $columns = $GLOBALS['dbi']->getColumns($db, $view);
         foreach ($columns as $column) {
-            $col_as = $column['Field'];
+            $col_as = $column['Field'] ?? null;
             if (! empty($aliases[$db]['tables'][$view]['columns'][$col_as])) {
                 $col_as = $aliases[$db]['tables'][$view]['columns'][$col_as];
             }

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -3102,10 +3102,10 @@ public static function asWKT($data, $includeSRID = false)
             $wktsql
         );
         $wktarr     = $GLOBALS['dbi']->fetchRow($wktresult, 0);
-        $wktval     = $wktarr[0];
+        $wktval     = $wktarr[0] ?? null;
 
         if ($includeSRID) {
-            $srid = $wktarr[1];
+            $srid = $wktarr[1] ?? null;
             $wktval = "'" . $wktval . "'," . $srid;
         }
         @$GLOBALS['dbi']->freeResult($wktresult);