[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-438-g66a9bd9

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  66a9bd96f33f7a94d29ca2a17d7fe52754bd5218 (commit)
      from  bf12c250dc611bd4b1dffa609fa82bab0f55c58e (commit)

Summary of changes:
 share/html/Elements/Menu      |    2 +-
 share/html/Elements/WidgetBar |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 66a9bd96f33f7a94d29ca2a17d7fe52754bd5218
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Nov 9 18:26:42 2010 +0000

    Nav bulletproofing to unbreak the setup wizard

diff --git a/share/html/Elements/Menu b/share/html/Elements/Menu
index 5e9c1c7..116f1e7 100755
--- a/share/html/Elements/Menu
+++ b/share/html/Elements/Menu
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-
+% return unless ($menu);
 <%" " x $depth%><ul<%$id ? ' id="'.$id.'"' : '' |n%><% $toplevel? ' class="toplevel"' : '' |n %>>
 % for my $child ($menu->children) {
 %   my $item_id = lc(($parent_id? $parent_id."-" : "") .$child->key);
diff --git a/share/html/Elements/WidgetBar b/share/html/Elements/WidgetBar
index 22c7f7c..1dcab6b 100644
--- a/share/html/Elements/WidgetBar
+++ b/share/html/Elements/WidgetBar
@@ -45,6 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+% return unless ($menu);
 % for my $child ($menu->children) {
 % if ($child->escape_title) {
 <%$child->title%>\

-----------------------------------------------------------------------