From 7405613b6d137dae6d4a5273d6859640c74a4054 Mon Sep 17 00:00:00 2001
From: Wouter van Oijen <wouter@webgui-svn>
Date: Thu, 20 Jul 2006 12:41:32 +0000
Subject: [PATCH] fix: Missing documentation breaks the list of Available
 Macros

---
 docs/changelog/7.x.x.txt     | 2 ++
 lib/WebGUI/Operation/Help.pm | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index bdedc92a5..74889522e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,8 @@
 7.0.3
  - Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized
    department names.
+ - fix: Missing documentation breaks the List of Available Macros (Wouter
+   van Oijen / ProcoliX)
 
 
 7.0.2
diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm
index 2ef2417c2..68867d08e 100644
--- a/lib/WebGUI/Operation/Help.pm
+++ b/lib/WebGUI/Operation/Help.pm
@@ -132,7 +132,8 @@ sub _get {
 		return $help->{$id};
 	}
 	else {
-		return "Unable to load help for $namespace -> $id\n";
+		$session->errorHandler->warn("Unable to load help for $namespace -> $id");
+		return undef;
 	}
 }
 
@@ -301,6 +302,7 @@ sub www_viewHelp {
 	my @related = @{ $help->{related} };
 	foreach my $row (@related) {
 		my $relatedHelp = _get($session,$row->{tag},$row->{namespace});
+		next unless (defined $relatedHelp);
 		$ac->addSubmenuItem(_link($session,$row->{tag},$row->{namespace}),$i18n->get($relatedHelp->{title},$row->{namespace}));
 	}
         my %vars;