X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FTmplToken.pm;h=045269b80b76b40efacb0324a476da60b10a3797;hb=7d71d9507202ff667776bf9cb6de0bf2603ad0dd;hp=819d304bb5ec39291d91a0add1e41c1dff097246;hpb=3ce542ce2668770a5669d2fb98b666f42a5bd388;p=koha.git

diff --git a/C4/TmplToken.pm b/C4/TmplToken.pm
index 819d304bb5..045269b80b 100644
--- a/C4/TmplToken.pm
+++ b/C4/TmplToken.pm
@@ -4,28 +4,23 @@ package C4::TmplToken;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use C4::TmplTokenType;
-require Exporter;
-
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-###############################################################################
 
 =head1 NAME
 
@@ -37,14 +32,7 @@ This is a class representing a token scanned from an HTML::Template .tmpl file.
 
 =cut
 
-###############################################################################
 
-$VERSION = 3.07.00.049;
-
-@ISA = qw(Exporter);
-@EXPORT_OK = qw();
-
-###############################################################################
 
 sub new {
     my $this = shift;
@@ -103,7 +91,7 @@ sub set_children {
 # FIXME: DIRECTIVE is not necessarily TMPL_VAR !!
 sub parameters_and_fields {
     my $this = shift;
-    return map { $_->type == C4::TmplTokenType::DIRECTIVE? $_:
+    return map { $_->type == C4::TmplTokenType::DIRECTIVE() ? $_:
 		($_->type == C4::TmplTokenType::TAG
 			&& $_->string =~ /^<input\b/is)? $_: ()}
 	    @{$this->{'_kids'}};