[Jifty-commit] r631 -
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Feb 26 18:38:58 EST 2006
Author: jesse
Date: Sun Feb 26 18:38:58 2006
New Revision: 631
Modified:
/ (props changed)
jifty/trunk/lib/Jifty/Dispatcher.pm
jifty/trunk/lib/Jifty/Object.pm
jifty/trunk/lib/Jifty/RightsFrom.pm
Log:
r24739 at truegrounds: jesse | 2006-02-26 18:02:36 -0500
* Revert mistaken commit
Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm (original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm Sun Feb 26 18:38:58 2006
@@ -407,10 +407,11 @@
my $self = shift;
my $path = Jifty->web->request->path;
+ # XXX TODO: jesse commented this out because it weirdly breaks things
+ # $path =~ s{/index\.html$}{};
local $Dispatcher = $self->new();
- local $SIG{__DIE__} = 'IGNORE';
- local $SIG{__WARN__} = 'IGNORE';
+
eval {
$Dispatcher->_do_dispatch($path);
};
Modified: jifty/trunk/lib/Jifty/Object.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Object.pm (original)
+++ jifty/trunk/lib/Jifty/Object.pm Sun Feb 26 18:38:58 2006
@@ -60,9 +60,6 @@
}
my $depth = 1;
my $caller;
-
- local $SIG{'__DIE__'} = 'IGNORE';
-
eval {
package DB;
Modified: jifty/trunk/lib/Jifty/RightsFrom.pm
==============================================================================
--- jifty/trunk/lib/Jifty/RightsFrom.pm (original)
+++ jifty/trunk/lib/Jifty/RightsFrom.pm Sun Feb 26 18:38:58 2006
@@ -81,6 +81,7 @@
);
no strict 'refs';
no warnings 'redefine';
+ # XXX TODO clkao points out that this call should use Hook::LexWrap
local *{ $args{'as'} } = sub { \&{ $args{'sub_name'} }(shift @_, @{ $args{'args'} }, @_ ) };
local @{Jifty::RightsFrom::EXPORT_OK} = ($args{as});
More information about the Jifty-commit
mailing list