[Rt-commit] r5819 - rt/branches/3.4-RELEASE/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Tue Aug 29 12:59:30 2006
New Revision: 5819

Modified:
   rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm

Log:
* Code:
  $cf->Load(...)
  $field = $cf->id;
  unless( $field =~ /^\d+$/ )...
  may produce unint warning if field wasn't loaded,
  use "unless( $cf->id )" instead as we do everywhere


Modified: rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Ticket_Overlay.pm	Tue Aug 29 12:59:30 2006
@@ -3688,15 +3688,15 @@
     my $field = shift;
     if ( $field and $field !~ /^\d+$/ ) {
         my $cf = RT::CustomField->new( $self->CurrentUser );
-        $cf->LoadByNameAndQueue( Name => $field, Queue => $self->QueueObj->Id );
+        $cf->LoadByNameAndQueue( Name => $field, Queue => $self->Queue );
         unless ( $cf->id ) {
-            $cf->LoadByNameAndQueue( Name => $field, Queue => '0' );
+            $cf->LoadByNameAndQueue( Name => $field, Queue => 0 );
         }
-        $field = $cf->id;
-        unless ( $field =~ /^\d+$/ ) {
-          # If we didn't find a valid cfid, give up.
-          return RT::CustomFieldValues->new($self->CurrentUser);
+        unless ( $cf->id ) {
+            # If we didn't find a valid cfid, give up.
+            return RT::CustomFieldValues->new($self->CurrentUser);
         }
+        $field = $cf->id;
     }
     return $self->SUPER::CustomFieldValues($field);
 }