Author: jablko
Date: Wed Oct 27 18:19:04 2010
New Revision: 8587

Log:
->__toString() must return string

Modified:
   trunk/lib/model/QubitFunction.php

Modified: trunk/lib/model/QubitFunction.php
==============================================================================
--- trunk/lib/model/QubitFunction.php   Wed Oct 27 18:12:26 2010        (r8586)
+++ trunk/lib/model/QubitFunction.php   Wed Oct 27 18:19:04 2010        (r8587)
@@ -21,7 +21,13 @@
 {
   public function __toString()
   {
-    return $this->getAuthorizedFormOfName(array('cultureFallback' => true));
+    $string = $this->authorizedFormOfName;
+    if (!isset($string))
+    {
+      $string = $this->getAuthorizedFormOfName(array('sourceCulture' => true));
+    }
+
+    return (string) $string;
   }
 
   public function __get($name)

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" 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/qubit-commits?hl=en.

Reply via email to