pluf2 Commit Details

Date:

2008-11-10 04:45:41 (16 years 11 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

4c05e1d7a486e33d6f5868ea325bb41f71a23c8a

Parents:

c24dfe5824d43249bd55269f0cbd6cb8be9df374

Message:

Fixed to try to autodetect PEAR path.

In the error, if the file contains the string pear, ignore the E_STRICT
errors.

Changes:

File differences

-335
336 336
337 337
338 
339 
338
339
340
341
342
343
344
340 345
341 346
342 347
+ */␊
function PlufErrorHandler($code, $string, $file, $line) ␊
{ ␊
    if (E_STRICT == $code && ␊
        0 === strpos($file, Pluf::f('pear_path','/usr/share/php/'))) {␊
    if (E_STRICT == $code ␊
        && ␊
        (␊
         0 === strpos($file, Pluf::f('pear_path','/usr/share/php/'))␊
         or␊
         false !== strripos($file, 'pear') // if pear in the path, ignore␊
        ) {␊
        return;␊
    }␊
    $exception = new PlufErrorHandlerException($string, $code);␊
  */␊
 function PlufErrorHandler($code, $string, $file, $line) ␊
 { ␊
-    if (E_STRICT == $code && ␊
-=== strpos($file, Pluf::f('pear_path','/usr/share/php/'))) {␊
+    if (E_STRICT == $code ␊
+        && ␊
+        (␊
+=== strpos($file, Pluf::f('pear_path','/usr/share/php/'))␊
+         or␊
+         false !== strripos($file, 'pear') // if pear in the path, ignore␊
+        ) {␊
         return;␊
     }␊
     $exception = new PlufErrorHandlerException($string, $code);␊