From bd876bcd42a0ce8d1e44d87ba6c517cf6106ca37 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Tue, 12 Aug 2014 13:46:22 -0700
Subject: [PATCH] fix router/block unlinking, #29829, from #20742

---
 FS/FS/router.pm                      | 2 +-
 httemplate/edit/process/svc_acct.cgi | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/FS/FS/router.pm b/FS/FS/router.pm
index 937dc1f45..b3efa3b60 100755
--- a/FS/FS/router.pm
+++ b/FS/FS/router.pm
@@ -116,7 +116,7 @@ sub replace {
   my $error = $self->SUPER::replace($old, @_);
   return $error if $error;
 
-  if ( defined($self->blocknum) ) {
+  if ( length($self->blocknum) ) {
     #warn "FS::router::replace: blocknum = ".$self->blocknum."\n";
     # then release any blocks we're already holding
     foreach my $block ($self->addr_block) {
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index ca614cbd8..9cac2c568 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -102,10 +102,14 @@ if ( ! $error ) {
       map { $_ => $cgi->param("router_$_") }
       qw( routernum routername blocknum )
     });
-    if (length($router->routername == 0)) {
+    if (length($router->routername) == 0) {
       #sensible default
       $router->set('routername', $new->label);
     }
+    if (length($router->blocknum) == 0) {
+      #unset it
+      $router->set('blocknum', 0);
+    }
     push @child_objects, $router;
   }
 
-- 
2.11.0