Load XDB to workaround a segfault in PHP.

[platal.git] / include / platal.inc.php

diff --git a/include/platal.inc.php b/include/platal.inc.php
index de9fd8e..d8155f5 100644 (file)
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -43,8 +43,10 @@ function pl_autoload($cls, array $pathes = array())
 
     array_unshift($pathes, 'core/classes', 'classes');
     foreach ($pathes as $path) {
-        if (@include_once "$basepath/$path/$cls.php") {
-            return true;
+        if (file_exists("$basepath/$path/$cls.php")) {
+            if (include_once "$basepath/$path/$cls.php") {
+                return true;
+            }
         }
     }
     return false;
@@ -90,7 +92,7 @@ function pl_error_handler($errno, $errstr, $errfile, $errline)
     $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno;
     $errstr = utf8_encode(htmlentities($errstr));
     if (php_sapi_name() == 'cli') {
-        $GLOBALS['pl_errors'] = "$type: $errstr\n  $errfile:$errfile\n";
+        $GLOBALS['pl_errors'] = "$type: $errstr\n  $errfile:$errline\n";
     } else {
         $GLOBALS['pl_errors'][] =
             "<div class='phperror'>".