From 6cf621a52c97c9e06193306ee16cb0877c20eb7c Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 1 Nov 2019 23:03:45 +0100
Subject: [PATCH] Use ob_get_clean instead of ob_get_contents + ob_end_clean

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Config.php                 | 3 +--
 libraries/classes/Gis/GisVisualization.php   | 3 +--
 libraries/entry_points/changelog.php         | 3 +--
 libraries/entry_points/server/privileges.php | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 29ee2191b2..91ab1a74fc 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -1539,8 +1539,7 @@ class Config
             $retval .= '<div id="' . $id . '">';
             ob_start();
             include $filename;
-            $retval .= ob_get_contents();
-            ob_end_clean();
+            $retval .= ob_get_clean();
             $retval .= '</div>';
         }
         return $retval;
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index ec1d18263a..ce7b3188cc 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -391,8 +391,7 @@ class GisVisualization
         ob_start();
         imagepng($img, null, 9, PNG_ALL_FILTERS);
         imagedestroy($img);
-        $output = ob_get_contents();
-        ob_end_clean();
+        $output = ob_get_clean();
 
         // base64 encode
         $encoded = base64_encode($output);
diff --git a/libraries/entry_points/changelog.php b/libraries/entry_points/changelog.php
index 07bdacdc82..4ab8d10a7a 100644
--- a/libraries/entry_points/changelog.php
+++ b/libraries/entry_points/changelog.php
@@ -33,8 +33,7 @@ if (@is_readable($filename)) {
     if (substr($filename, -3) == '.gz') {
         ob_start();
         readgzfile($filename);
-        $changelog = ob_get_contents();
-        ob_end_clean();
+        $changelog = ob_get_clean();
     } else {
         $changelog = file_get_contents($filename);
     }
diff --git a/libraries/entry_points/server/privileges.php b/libraries/entry_points/server/privileges.php
index 007e44ab27..01847c3eba 100644
--- a/libraries/entry_points/server/privileges.php
+++ b/libraries/entry_points/server/privileges.php
@@ -414,8 +414,7 @@ if (isset($_GET['viewing_mode']) && $_GET['viewing_mode'] == 'db') {
         $pos
     ) = PhpMyAdmin\Util::getDbInfo($db, $sub_part === null ? '' : $sub_part);
 
-    $content = ob_get_contents();
-    ob_end_clean();
+    $content = ob_get_clean();
     $response->addHTML($content . "\n");
 } elseif (! empty($GLOBALS['message'])) {
     $response->addHTML(PhpMyAdmin\Util::getMessage($GLOBALS['message']));