Changeset 8134

Timestamp:

03/28/08 14:58:14 (3 months ago)

Author:

fabien

Message:

fixed merge problem

Files:

• trunk/lib/exception/sfException.class.php (modified) (2 diffs)

trunk/lib/exception/sfException.class.php

@@ -112 +112 @@
-      $file = sfConfig::get('sf_web_dir').'/errors/error500.php';
-
-<<<<<<< .working
-      ob_start();
-      include is_readable($file) ? $file : sfConfig::get('sf_symfony_data_dir').'/web/errors/error500.php';
-=======
-      include is_readable($file) ? $file : dirname(__FILE__).'/data/error500.php';
->>>>>>> .merge-right.r8006
-
-      return ob_get_clean();
@@ -139 +135 @@
-    }
-
-<<<<<<< .working
-    ob_start();
-    include sfConfig::get('sf_symfony_data_dir').'/data/exception.'.($format == 'html' ? 'php' : 'txt');
-=======
-    include dirname(__FILE__).'/data/exception.'.($format == 'html' ? 'php' : 'txt');
->>>>>>> .merge-right.r8006
-
-    return ob_get_clean();