Author: rande
Date: 2010-03-15 21:35:00 +0100 (Mon, 15 Mar 2010)
New Revision: 28535

Modified:
   
plugins/swFormExtraPlugin/branches/sf1.2/lib/form/swResetLabelTranslation.class.php
   
plugins/swFormExtraPlugin/branches/sf1.3/lib/form/swResetLabelTranslation.class.php
Log:
[swFormExtraPlugin] avoid calling autoload function

Modified: 
plugins/swFormExtraPlugin/branches/sf1.2/lib/form/swResetLabelTranslation.class.php
===================================================================
--- 
plugins/swFormExtraPlugin/branches/sf1.2/lib/form/swResetLabelTranslation.class.php
 2010-03-15 20:09:30 UTC (rev 28534)
+++ 
plugins/swFormExtraPlugin/branches/sf1.2/lib/form/swResetLabelTranslation.class.php
 2010-03-15 20:35:00 UTC (rev 28535)
@@ -58,7 +58,7 @@
       return $subject->__toString();
     }
 
-    if(method_exists($subject, 'getCatalogue') && 
is_null($subject->getCatalogue()))
+    if(is_object($subject) && method_exists($subject, 'getCatalogue') && 
is_null($subject->getCatalogue()))
     {
       $catalogue = $subject->getCatalogue();
     }

Modified: 
plugins/swFormExtraPlugin/branches/sf1.3/lib/form/swResetLabelTranslation.class.php
===================================================================
--- 
plugins/swFormExtraPlugin/branches/sf1.3/lib/form/swResetLabelTranslation.class.php
 2010-03-15 20:09:30 UTC (rev 28534)
+++ 
plugins/swFormExtraPlugin/branches/sf1.3/lib/form/swResetLabelTranslation.class.php
 2010-03-15 20:35:00 UTC (rev 28535)
@@ -58,7 +58,7 @@
       return $subject->__toString();
     }
 
-    if(method_exists($subject, 'getCatalogue') && 
is_null($subject->getCatalogue()))
+    if(is_object($subject) && method_exists($subject, 'getCatalogue') && 
is_null($subject->getCatalogue()))
     {
       $catalogue = $subject->getCatalogue();
     }

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to