[Jifty-commit] r3734 - in jifty/trunk: lib/Jifty/View/Declare
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Jul 29 17:53:46 EDT 2007
Author: jesse
Date: Sun Jul 29 17:53:45 2007
New Revision: 3734
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/View/Declare/BaseClass.pm
jifty/trunk/lib/Jifty/View/Declare/Helpers.pm
jifty/trunk/lib/Jifty/View/Declare/Page.pm
Log:
r64915 at pinglin: jesse | 2007-07-29 17:53:35 -0400
* Resolve import conflicts now that T::D and J::V::D::Helpers have a thingy with the same name
Modified: jifty/trunk/lib/Jifty/View/Declare/BaseClass.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/BaseClass.pm (original)
+++ jifty/trunk/lib/Jifty/View/Declare/BaseClass.pm Sun Jul 29 17:53:45 2007
@@ -4,7 +4,6 @@
use warnings;
use base qw/Exporter Jifty::View::Declare::Helpers/;
use Scalar::Defer;
-use Template::Declare::Tags;
use PadWalker;
use Jifty::View::Declare::Helpers;
Modified: jifty/trunk/lib/Jifty/View/Declare/Helpers.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Helpers.pm (original)
+++ jifty/trunk/lib/Jifty/View/Declare/Helpers.pm Sun Jul 29 17:53:45 2007
@@ -2,10 +2,10 @@
use strict;
package Jifty::View::Declare::Helpers;
-use base qw/Template::Declare Exporter/;
use Template::Declare::Tags;
+use base qw/Template::Declare Exporter/;
-our @EXPORT = ( qw(form hyperlink tangent redirect new_action form_submit form_return form_next_page page content wrapper request get set render_param current_user render_action render_region), @Template::Declare::Tags::EXPORT);
+our @EXPORT = ( qw(hyperlink tangent redirect new_action form_submit form_return form_next_page page content wrapper request get set render_param current_user render_action render_region), @Template::Declare::Tags::EXPORT);
=head1 NAME
@@ -29,7 +29,7 @@
{
no warnings qw/redefine/;
- sub form (&) {
+ sub form (&;$) {
my $code = shift;
smart_tag_wrapper {
Modified: jifty/trunk/lib/Jifty/View/Declare/Page.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Page.pm (original)
+++ jifty/trunk/lib/Jifty/View/Declare/Page.pm Sun Jul 29 17:53:45 2007
@@ -2,7 +2,6 @@
use strict;
use warnings;
use base qw/Template::Declare Class::Accessor::Fast/;
-use Template::Declare::Tags;
=head1 NAME
More information about the Jifty-commit
mailing list