From dd505e556e49269917090b6f1fcc30af01adca45 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 24 Jun 2012 00:27:21 +0100
Subject: [PATCH] avoid using magic internal database->db value

---
 ext/et/main.php      | 2 +-
 ext/upgrade/main.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/et/main.php b/ext/et/main.php
index 65b72b97..e5dae4e7 100644
--- a/ext/et/main.php
+++ b/ext/et/main.php
@@ -44,7 +44,7 @@ class ET extends Extension {
 		$info['sys_shimmie'] = VERSION;
 		$info['sys_schema']  = $config->get_string("db_version");
 		$info['sys_php']     = phpversion();
-		$info['sys_db']      = $database->db->getAttribute(PDO::ATTR_DRIVER_NAME);
+		$info['sys_db']      = $database->engine->name;
 		$info['sys_os']      = php_uname();
 		$info['sys_disk']    = to_shorthand_int(disk_total_space("./") - disk_free_space("./")) . " / " .
 		                       to_shorthand_int(disk_total_space("./"));
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index f5db9a10..2c391fe0 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -40,7 +40,7 @@ class Upgrade extends Extension {
 			$config->set_bool("in_upgrade", true);
 			$config->set_int("db_version", 9);
 
-			if($database->db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
+			if($database->engine->name == 'mysql') {
 				$tables = $database->get_col("SHOW TABLES");
 				foreach($tables as $table) {
 					log_info("upgrade", "converting $table to innodb");