r2835 - printLog(): sayonara, merged into showMessageOrError()

diff --git a/inc/interface.php b/inc/interface.php
index 5ff6d8edb518e5ebaae2d4e019b8995f5f9b6209..a27b5affe8a1f175b5bed04f4a251fc87016f90d 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -1153,15 +1153,6 @@ function renderRackMultiSelect ($sname, $racks, $selected)
        echo "</select>\n";
 }
 
-function showMessageOrError ()
-{
-       if (isset ($_SESSION['log']))
-       {
-               printLog ($_SESSION['log']);
-               unset($_SESSION['log']);
-       }
-}
-
 // This function renders a form for port edition.
 function renderPortsForObject ($object_id)
 {
@@ -1376,8 +1367,11 @@ function renderIPv4ForObject ($object_id)
 // 1: the whole structure is a list of code-message pairs
 // 2 and later: there's a "v" field set, which indicates the version
 // 2: there's a "m" list set to hold message code and optional arguments
-function printLog ($log)
+function showMessageOrError ()
 {
+       if (!isset ($_SESSION['log']))
+               return;
+       $log = $_SESSION['log'];
        switch (TRUE)
        {
                case !isset ($log['v']):
@@ -1629,6 +1623,7 @@ function printLog ($log)
                        echo '<div class=msg_error>' . __FUNCTION__ . ': internal error</div>';
                        break;
        }
+       unset($_SESSION['log']);
 }
 
 /*