fixed enabling of Perl 5.10 features in Mojo::Base and Mojolicious::Lite

mojolicious · May 9, 2011 · fe49279 · fe49279
1 parent c912390
commit fe49279
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,8 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved reloading slightly by allowing it to clean up the main
           namespace.
         - Improved documentation.
+        - Fixed enabling of Perl 5.10 features in Mojo::Base and
+          Mojolicious::Lite. (garu, sri)
 
 1.31    2011-05-08 00:00:00
         - Reverted deprecation of Perl 5.8.x support, by popular demand.

diff --git a/lib/Mojo/Base.pm b/lib/Mojo/Base.pm
@@ -42,7 +42,10 @@ sub import {
   warnings->import;
 
   # Mojo modules are modern!
-  feature->import(':5.10') if $] >= 5.010;
+  if ($] >= 5.010) {
+    require feature;
+    feature->import(':5.10');
+  }
 }
 
 sub new {

diff --git a/lib/Mojolicious/Lite.pm b/lib/Mojolicious/Lite.pm
@@ -16,7 +16,10 @@ sub import {
   warnings->import;
 
   # Lite apps are modern!
-  feature->import(':5.10') if $] >= 5.010;
+  if ($] >= 5.010) {
+    require feature;
+    feature->import(':5.10');
+  }
 
   # Executable
   $ENV{MOJO_EXE} ||= (caller)[1];

diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -98,7 +98,7 @@ sub register {
       else { $args = shift || {} }
 
       # Default name
-      $name ||= join '', map { $_ || '' } caller(1);
+      $name ||= join '', map { $_ || '' } (caller(1))[0 .. 3];
 
       # Expire
       my $expires = $args->{expires} || 0;