summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-01-04 22:13:43 +0000
committerthomascube <thomas@roundcube.net>2011-01-04 22:13:43 +0000
commit965ed0ca7f5e07dc6d7d7e08ad8215b7c1c63b83 (patch)
tree29db048f42e525e7f8668d58646495172071edbf
parent6bdb6102c06c605d18f5d2cfba8ac806875ae13a (diff)
Silently ignore unknown classes in rcube_autoload (#1487109)
-rw-r--r--CHANGELOG1
-rwxr-xr-xprogram/include/iniset.php9
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 17a6563f3..652ac2b58 100644
--- a/CHANGELOG
+++ b/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/program/include/iniset.php b/program/include/iniset.php
index 5ef067f65..b5ca1a8cf 100755
--- a/program/include/iniset.php
+++ b/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');