Merge pull request joomla#1477 from realityking/pdo

Deal with the PDO class not being available.
aaronschmitz · Aug 20, 2012 · 9f8a82c · 9f8a82c
2 parents c600d0a + 42811ff
commit 9f8a82c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
@@ -515,7 +515,7 @@ public function unlockTables()
 	 */
 	public static function isSupported()
 	{
-		return in_array('oci', PDO::getAvailableDrivers());
+		return class_exists('PDO') && in_array('oci', PDO::getAvailableDrivers());
 	}
 
 	/**

diff --git a/libraries/joomla/database/driver/sqlite.php b/libraries/joomla/database/driver/sqlite.php
@@ -38,19 +38,6 @@ class JDatabaseDriverSqlite extends JDatabaseDriverPdo
 	 */
 	protected $nameQuote = '`';
 
-	/**
-	 * Constructor.
-	 *
-	 * @param   array  $options  List of options used to configure the connection
-	 *
-	 * @since   12.1
-	 */
-	public function __construct($options)
-	{
-		// Finalize initialisation
-		parent::__construct($options);
-	}
-
 	/**
 	 * Destructor.
 	 *
@@ -391,6 +378,6 @@ public function unlockTables()
 	 */
 	public static function isSupported()
 	{
-		return in_array('sqlite', PDO::getAvailableDrivers());
+		return class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers());
 	}
 }