From df86acd7dba6c9b81f7ff3eebf8264d6b504f442 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 30 Dec 2015 08:40:42 +0100
Subject: [PATCH] (menu / interfaces) empty description check fails

---
 .../mvc/app/controllers/OPNsense/Base/ControllerBase.php        | 2 +-
 src/www/head.inc                                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
index 8f7fa387b..45a37d55c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
@@ -206,7 +206,7 @@ class ControllerBase extends ControllerRoot
 
         $ifarr = array();
         foreach ($cnf->object()->interfaces->children() as $key => $node) {
-            $ifarr[$key] = $node->descr ? $node->descr->__toString() : strtoupper($key);
+            $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
         }
         natcasesort($ifarr);
         $ordid = 0;
diff --git a/src/www/head.inc b/src/www/head.inc
index 886627ade..5cf03ecfe 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -20,7 +20,7 @@ $menu = new OPNsense\Base\Menu\MenuSystem();
 $cnf = OPNsense\Core\Config::getInstance();
 $ifarr = array();
 foreach ($cnf->object()->interfaces->children() as $key => $node) {
-    $ifarr[$key] = $node->descr ? $node->descr->__toString() : strtoupper($key);
+    $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
 }
 natcasesort($ifarr);
 $ordid = 0;