vitalif
/
VMXTemplate
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always import constants

databind
vitalif 2009-11-02 14:31:15 +00:00 committed by Vitaliy Filippov
parent f45d829f1e
commit 224d47241c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VMX/Common.pm
View File

@ -7,8 +7,8 @@ use utf8;
use strict; use strict;
use Encode; use Encode;
use constant HASHARRAY => {Slice=>{}};
use constant { use constant {
HASHARRAY => {Slice=>{}},
TS_UNIX => 0, TS_UNIX => 0,
TS_DB => 1, TS_DB => 1,
TS_MW => 2, TS_MW => 2,
@ -30,7 +30,7 @@ our @EXPORT_OK = qw(
insertall_arrayref insertall_hashref deleteall_hashref dumper_no_lf str2time callif urandom insertall_arrayref insertall_hashref deleteall_hashref dumper_no_lf str2time callif urandom
normalize_url utf8on rfrom_to mysql2time mysqllocaltime resub requote normalize_url utf8on rfrom_to mysql2time mysqllocaltime resub requote
hashmrg litsplit strip_tagspace timestamp hashmrg litsplit strip_tagspace timestamp
); ), @EXPORT;
our %EXPORT_TAGS = (all => [ @EXPORT_OK ]); our %EXPORT_TAGS = (all => [ @EXPORT_OK ]);
# для strip_unsafe_tags() # для strip_unsafe_tags()
@ -49,7 +49,7 @@ sub import
my @args = @_; my @args = @_;
my $dbi_hacks = 0; my $dbi_hacks = 0;
my $uri_escape_hacks = 0; my $uri_escape_hacks = 0;
my $hasharray = 1; my $export = { map { $_ => 1 } @EXPORT };
foreach (@args) foreach (@args)
{ {
if ($_ eq 'dbi_hacks') if ($_ eq 'dbi_hacks')
@ -62,12 +62,12 @@ sub import
$_ = '!uri_escape_hacks'; $_ = '!uri_escape_hacks';
$uri_escape_hacks = 1; $uri_escape_hacks = 1;
} }
elsif ($_ eq '!HASHARRAY') elsif (substr($_,0,1) eq '!' && $export->{substr($_,1)})
{ {
$hasharray = 0; delete $export->{substr($_,1)};
} }
} }
push @args, 'HASHARRAY' if $hasharray; push @args, keys %$export;
if ($dbi_hacks) if ($dbi_hacks)
{ {
require DBI; require DBI;