[Jifty-commit] r1293 - in jifty/trunk: lib lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Jun 14 19:26:27 EDT 2006
Author: alexmv
Date: Wed Jun 14 19:26:22 2006
New Revision: 1293
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty.pm
jifty/trunk/lib/Jifty/Plugin.pm
jifty/trunk/lib/Jifty/Util.pm
Log:
r13943 at zoq-fot-pik: chmrr | 2006-06-14 19:26:00 -0400
* Cache plugin template and static roots
* Indentation nit in Jifty::Util
* Jifty version bump
Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm (original)
+++ jifty/trunk/lib/Jifty.pm Wed Jun 14 19:26:22 2006
@@ -5,7 +5,7 @@
use encoding 'utf8';
# Work around the fact that Time::Local caches thing on first require
BEGIN { local $ENV{'TZ'} = "GMT"; require Time::Local;}
-$Jifty::VERSION = '0.60507';
+$Jifty::VERSION = '0.60714';
=head1 NAME
Modified: jifty/trunk/lib/Jifty/Plugin.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin.pm Wed Jun 14 19:26:22 2006
@@ -96,9 +96,12 @@
sub template_root {
my $self = shift;
my $class = ref($self) || $self;
- my $share = eval { File::ShareDir::module_dir($class) };
- return unless $share;
- return "$share/web/templates";
+ unless (exists $self->{share}) {
+ $self->{share} = undef;
+ eval { $self->{share} = File::ShareDir::module_dir($class) };
+ }
+ return unless $self->{share};
+ return $self->{share}."/web/templates";
}
=head2 static_root
@@ -110,9 +113,12 @@
sub static_root {
my $self = shift;
my $class = ref($self) || $self;
- my $share = eval { File::ShareDir::module_dir($class) };
- return unless $share;
- return "$share/web/static";
+ unless (exists $self->{share}) {
+ $self->{share} = undef;
+ eval { $self->{share} = File::ShareDir::module_dir($class) };
+ }
+ return unless $self->{share};
+ return $self->{share}."/web/static";
}
=head2 dispatcher
Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm (original)
+++ jifty/trunk/lib/Jifty/Util.pm Wed Jun 14 19:26:22 2006
@@ -51,9 +51,9 @@
sub jifty_root {
my $self = shift;
unless ($JIFTY_ROOT) {
- my ($vol,$dir,$file) = File::Spec->splitpath($INC{"Jifty.pm"});
- $JIFTY_ROOT = File::Spec->rel2abs($dir);
-}
+ my ($vol,$dir,$file) = File::Spec->splitpath($INC{"Jifty.pm"});
+ $JIFTY_ROOT = File::Spec->rel2abs($dir);
+ }
return ($JIFTY_ROOT);
}
More information about the Jifty-commit
mailing list