[Jifty-commit] r3440 - jifty/trunk/lib/Jifty

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Mon Jun 11 03:32:36 2007
New Revision: 3440

Modified:
   jifty/trunk/lib/Jifty/Web.pm

Log:
Fix javascript emission when CompressedCSSandJS plugin is not loaded noticed
by dpavlin++.


Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Mon Jun 11 03:32:36 2007
@@ -1177,7 +1177,9 @@
 sub include_javascript {
     my $self  = shift;
 
-    $self->call_trigger('include_javascript', @_) or return '';
+    # if there's no trigger, 0 is returned.  if aborted/handled, undef
+    # is returned.
+    defined $self->call_trigger('include_javascript', @_) or return '';
 
     for my $file ( @{ __PACKAGE__->javascript_libs } ) {
         $self->out(