diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index af6f2f01d..1a95860e3 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -314,11 +314,6 @@ class DB { $db_type = $supported_list[$i]; - if(version_compare(phpversion(), '5.0') < 0 && preg_match('/pdo/i', $db_type)) - { - continue; - } - $class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1))); $class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name); if(!file_exists($class_file)) diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php index 7842db788..db8089a0c 100644 --- a/classes/mail/Mail.class.php +++ b/classes/mail/Mail.class.php @@ -1,14 +1,7 @@ */ -if(version_compare(PHP_VERSION, '5.0.0', '>=')) -{ - require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php"; -} -else -{ - require_once _XE_PATH_ . "libs/phpmailer/class.phpmailer.php"; -} +require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php"; /** * Mailing class for XpressEngine