From 82ab898a5a933122e2fd66b918882ff9d985a5df Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 21 Apr 2019 20:04:32 +0200
Subject: [PATCH] interfaces: changes to previous

---
 src/www/interfaces.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index e6c05aa0e..d8946d569 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -773,12 +773,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 }
                 break;
             case "track6":
+                if (!empty($pconfig['track6-prefix-id--hex']) && strstr($pconfig['track6-prefix-id--hex'], '0x') === 0) {
+                    $pconfig['track6-prefix-id--hex'] = substr($pconfig['track6-prefix-id--hex'], 2);
+                }
                 if (!empty($pconfig['track6-prefix-id--hex']) && !ctype_xdigit($pconfig['track6-prefix-id--hex'])) {
                     $input_errors[] = gettext("You must enter a valid hexadecimal number for the IPv6 prefix ID.");
                 } elseif (!empty($pconfig['track6-interface'])) {
-                    if (stristr($pconfig['track6-prefix-id--hex'], '0x') === 0) {
-                        $pconfig['track6-prefix-id--hex'] = substr($pconfig['track6-prefix-id--hex'], 2);
-                    }
                     $ipv6_delegation_length = calculate_ipv6_delegation_length($pconfig['track6-interface']);
                     if ($ipv6_delegation_length >= 0) {
                         $ipv6_num_prefix_ids = pow(2, $ipv6_delegation_length);