X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FObjectCustomFields_Overlay.pm;h=3631a9ad48bd0d559e5c8b680a9e6e137e73a7ad;hb=90edd8a914fd484e649fb0aa051dce7927bd6881;hp=a496c4bbd476fda9b36109601f4ad56dccff05ec;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/rt/lib/RT/ObjectCustomFields_Overlay.pm b/rt/lib/RT/ObjectCustomFields_Overlay.pm
index a496c4bbd..3631a9ad4 100644
--- a/rt/lib/RT/ObjectCustomFields_Overlay.pm
+++ b/rt/lib/RT/ObjectCustomFields_Overlay.pm
@@ -1,38 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
-# 
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -41,8 +43,9 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
+
 package RT::ObjectCustomFields;
 
 use strict;
@@ -63,17 +66,19 @@ sub LimitToObjectId {
 sub LimitToLookupType {
     my $self = shift;
     my $lookup = shift;
-    unless ($self->{'_cfs_alias'}) {
-        $self->{'_cfs_alias'}  = $self->NewAlias('CustomFields');
-    }
-    $self->Join( ALIAS1 => 'main',
-                FIELD1 => 'CustomField',
-                ALIAS2 => $self->{'_cfs_alias'},
-                FIELD2 => 'id' );
-    $self->Limit( ALIAS           => $self->{'_cfs_alias'},
-                 FIELD           => 'LookupType',
-                 OPERATOR        => '=',
-                 VALUE           => $lookup );
+
+    $self->{'_cfs_alias'} ||= $self->Join(
+        ALIAS1 => 'main',
+        FIELD1 => 'CustomField',
+        TABLE2 => 'CustomFields',
+        FIELD2 => 'id',
+    );
+    $self->Limit(
+        ALIAS    => $self->{'_cfs_alias'},
+        FIELD    => 'LookupType',
+        OPERATOR => '=',
+        VALUE    => $lookup,
+    );
 }
 
 sub HasEntryForCustomField {