Fixing warns (tnx to Chris Cormack for identifying these)
authorChris Nighswonger <cnighswonger@foundations.edu>
Thu, 3 Sep 2009 03:47:33 +0000 (23:47 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Sat, 5 Sep 2009 23:56:20 +0000 (19:56 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

C4/Labels/Template.pm
labels/label-item-search.pl

index 866a79b..5e9569d 100644 (file)
@@ -124,7 +124,7 @@ sub retrieve {
     }
     my $self = $sth->fetchrow_hashref;
     $self = _conv_points($self) if (($opts{convert} && $opts{convert} == 1) || $opts{profile_id});
-    $self = _apply_profile($self) if $opts{profile_id};
+    $self = _apply_profile($self) if $opts{profile_id} && $self->{'profile_id'};        # don't bother if there is no profile_id
     $self->{'template_stat'} = 1;
     bless ($self, $type);
     return $self;
index 8f950ec..a8a56ac 100755 (executable)
@@ -48,7 +48,7 @@ BEGIN {
 my $query = new CGI;
 
 my $type      = $query->param('type');
-my $op        = $query->param('op');
+my $op        = $query->param('op') || '';
 my $batch_id  = $query->param('batch_id');
 my $ccl_query = $query->param('ccl_query');
 my $startfrom = $query->param('startfrom') || 1;