[interchange] Revert "Fix for restrict_allow which was being clobbered by default values."

Sam Batschelet interchange-cvs at icdevgroup.org
Mon May 9 20:58:43 UTC 2016


commit d8430ddaadb1f72c201d4bab672ae646dcd78632
Author: Sam Batschelet <samb at endpoint.com>
Date:   Mon May 9 16:57:14 2016 -0400

    Revert "Fix for restrict_allow which was being clobbered by default values."
    
    This reverts commit 8ba9a07d0f0098b5cae6cb4400bf8ead5f4aa91b.

 lib/Vend/Table/Editor.pm |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/lib/Vend/Table/Editor.pm b/lib/Vend/Table/Editor.pm
index de9eb7a..141eed3 100644
--- a/lib/Vend/Table/Editor.pm
+++ b/lib/Vend/Table/Editor.pm
@@ -916,11 +916,7 @@ sub display {
 			last METAMAKE;
 		}
 
-		if ($record->{restrict_allow}) {
-			my %restrict_allow;
-			@restrict_allow{grep /\S/, split / /, $opt->{restrict_allow} . ' ' . $record->{restrict_allow}} = ();
-			$opt->{restrict_allow} = join ' ', sort keys %restrict_allow;
-		} 
+		$opt->{restrict_allow} ||= $record->{restrict_allow};
 #::logDebug("formatting prepend/append/lookup_query name=$opt->{name} restrict_allow=$opt->{restrict_allow}");
 		for(qw/append prepend lookup_query/) {
 			next unless $record->{$_};



More information about the interchange-cvs mailing list