Changeset 2976

Timestamp:

07/06/2008 07:22:40 PM (5 months ago)

Author:

Shadowhand

Message:

Merged r2975 into tags/2.1.3

Files:

• tags/2.1.3/system/libraries/ORM.php (modified) (1 diff)

tags/2.1.3/system/libraries/ORM.php

@@ -102 +102 @@
                 if ($this->auto_save == TRUE)
                 {
-                        // Automatically save the model
-                        $this->save();
+                        try
+                        {
+                                // Automatically save the model
+                                $this->save();
+                        }
+                        catch (Exception $e)
+                        {
+                                /// Log the error, rather than trying to display it, to avoid
+                                // "stack frame" errors. http://bugs.php.net/bug.php?id=33598
+                                Log::add('error', $e->getMessage());
+                        }
                 }
         }