Permalink
Browse files

Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange

  • Loading branch information...
2 parents a9b14c2 + beba56f commit b62cf1c112cbc8130658e71878b3d09f03778457 Mike Heins committed Jul 12, 2013
Showing with 7 additions and 5 deletions.
  1. +2 −0 code/UI_Tag/version.coretag
  2. +5 −5 dist/lib/UI/ContentEditor.pm
View
2 code/UI_Tag/version.coretag
@@ -150,6 +150,7 @@ sub {
Crypt::SSLeay
DBI
Digest::MD5
+ Digest::SHA
Image::Size
LWP::Simple
MIME::Base64
@@ -173,6 +174,7 @@ sub {
'Crypt::SSLeay' => q{Payment interface links via HTTPS/SSL.},
'DBI' => q{Most people want to use SQL with Interchange, and this is a requirement. You will also need the appropriate DBD module, i.e. DBD::mysql to support MySQL.},
'Digest::MD5' => q{IMPORTANT: cache keys and other search-related functions will not work.},
+ 'Digest::SHA' => q{Used by sha1 filter, optional UserDB functionality, and some payment modules.},
'Image::Size' => q{Optional but recommended for [image ...] tag.},
'LWP::Simple' => q{External UPS lookup and other internet-related functions will not work.},
'MIME::Base64' => q{Provides HTTP services for internal HTTP server and basic authentication.},
View
10 dist/lib/UI/ContentEditor.pm
@@ -756,7 +756,7 @@ sub read_template {
my $q = join " ", @atoms;
my $ary = $db->query({ sql => $q, hashref => 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$spec" ];
+ push @data, [ $_->{comp_text}, "$tname::$spec" ];
}
}
}
@@ -884,7 +884,7 @@ sub read_component {
my $q = join " ", @atoms;
my $ary = $db->query({ sql => $q, hashref => 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$spec" ];
+ push @data, [ $_->{comp_text}, "$tname::$spec" ];
}
}
}
@@ -1146,7 +1146,7 @@ sub available_components {
my $q = join " ", @atoms;
my $ary = $db->query({ sql => $q, hashref => 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+ push @data, [ $_->{comp_text}, "$tname::$_->{code}" ];
}
}
my @out;
@@ -1201,7 +1201,7 @@ sub available_templates {
my $q = join " ", @atoms;
my $ary = $db->query({ sql => $q, hashref => 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$_->{code}" ];
+ push @data, [ $_->{comp_text}, "$tname::$_->{code}" ];
}
}
my @out;
@@ -1333,7 +1333,7 @@ sub read_page {
my $q = join " ", @atoms;
my $ary = $db->query({ sql => $q, hashref => 1 });
for(@$ary) {
- push @data, [ $_->{comp_text}, "$table::$spec" ];
+ push @data, [ $_->{comp_text}, "$tname::$spec" ];
}
}
else {

0 comments on commit b62cf1c

Please sign in to comment.