From 431a47007d23d6cf41a993459321be6b82efdc7a Mon Sep 17 00:00:00 2001 From: thomasb Date: Tue, 4 Jan 2011 22:13:43 +0000 Subject: Silently ignore unknown classes in rcube_autoload (#1487109) git-svn-id: https://svn.roundcube.net/trunk@4394 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/include/iniset.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 17a6563f3..652ac2b58 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Make rcube_autoload silently skip unknown classes (#1487109) - Fix charset detection in vcards with encoded values (#1485542) - Better CSS cursors for splitters (#1486874) - Show the same message only once (#1487641) diff --git a/roundcubemail/program/include/iniset.php b/roundcubemail/program/include/iniset.php index 5ef067f65..b5ca1a8cf 100755 --- a/roundcubemail/program/include/iniset.php +++ b/roundcubemail/program/include/iniset.php @@ -105,7 +105,14 @@ function rcube_autoload($classname) ), $classname ); - include $filename. '.php'; + + if ($fp = @fopen("$filename.php", 'r', true)) { + fclose($fp); + include_once("$filename.php"); + return true; + } + + return false; } spl_autoload_register('rcube_autoload'); -- cgit v1.2.3