5 files changed, 30 insertions, 30 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 84e9e8c462..01447a6232 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -92,7 +92,7 @@ function phpbb_insert_forums()
 		$src_db->sql_query("SET NAMES 'utf8'");
 	}
 
-	switch ($db->sql_layer)
+	switch ($db->get_sql_layer())
 	{
 		case 'mssql':
 		case 'mssql_odbc':
@@ -289,7 +289,7 @@ function phpbb_insert_forums()
 	}
 	$src_db->sql_freeresult($result);
 
-	switch ($db->sql_layer)
+	switch ($db->get_sql_layer())
 	{
 		case 'postgres':
 			$db->sql_query("SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));');
@@ -1768,7 +1768,7 @@ function phpbb_create_userconv_table()
 	global $db, $src_db, $convert, $table_prefix, $user, $lang;
 
 	$map_dbms = '';
-	switch ($db->sql_layer)
+	switch ($db->get_sql_layer())
 	{
 		case 'mysql':
 			$map_dbms = 'mysql_40';
@@ -1796,7 +1796,7 @@ function phpbb_create_userconv_table()
 		break;
 
 		default:
-			$map_dbms = $db->sql_layer;
+			$map_dbms = $db->get_sql_layer();
 		break;
 	}
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index c349d71563..63e4e8f4ac 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -176,7 +176,7 @@ header('Content-type: text/html; charset=UTF-8');
 
 								<br />
 
-								<p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->sql_layer; ?></strong><br />
+								<p><?php echo $user->lang['DATABASE_TYPE']; ?> :: <strong><?php echo $db->get_sql_layer(); ?></strong><br />
 								<?php echo $user->lang['PREVIOUS_VERSION']; ?> :: <strong><?php echo $config['version']; ?></strong><br />
 
 <?php
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index bff7b75b18..c8a745825a 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -688,7 +688,7 @@ class module
 		));
 
 		// Rollback if in transaction
-		if ($db->transaction)
+		if ($db->get_transaction())
 		{
 			$db->sql_transaction('rollback');
 		}
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index a0d5e802e6..6109f5e28b 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -248,7 +248,7 @@ class install_convert extends module
 					));
 				}
 
-				switch ($db->sql_layer)
+				switch ($db->get_sql_layer())
 				{
 					case 'sqlite':
 					case 'sqlite3':
@@ -727,7 +727,7 @@ class install_convert extends module
 			$src_db->sql_query("SET NAMES 'binary'");
 		}
 
-		switch ($db->sql_layer)
+		switch ($db->get_sql_layer())
 		{
 			case 'sqlite':
 			case 'sqlite3':
@@ -1129,7 +1129,7 @@ class install_convert extends module
 
 				if (!empty($schema['autoincrement']))
 				{
-					switch ($db->sql_layer)
+					switch ($db->get_sql_layer())
 					{
 						case 'postgres':
 							$db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));');
@@ -1268,7 +1268,7 @@ class install_convert extends module
 
 				if (!empty($schema['autoincrement']))
 				{
-					switch ($db->sql_layer)
+					switch ($db->get_sql_layer())
 					{
 						case 'mssql':
 						case 'mssql_odbc':
@@ -1301,7 +1301,7 @@ class install_convert extends module
 
 					if ($sql_flag === true)
 					{
-						switch ($db->sql_layer)
+						switch ($db->get_sql_layer())
 						{
 							// If MySQL, we'll wait to have num_wait_rows rows to submit at once
 							case 'mysql':
@@ -1396,7 +1396,7 @@ class install_convert extends module
 
 				if (!empty($schema['autoincrement']))
 				{
-					switch ($db->sql_layer)
+					switch ($db->get_sql_layer())
 					{
 						case 'mssql':
 						case 'mssql_odbc':
@@ -1635,7 +1635,7 @@ class install_convert extends module
 				'RESULT'	=> $user->lang['DONE'],
 			));
 
-			if ($db->sql_error_triggered)
+			if ($db->get_sql_error_triggered())
 			{
 				$template->assign_vars(array(
 					'S_ERROR_BOX'	=> true,
@@ -1808,7 +1808,7 @@ class install_convert extends module
 		global $convert;
 
 		// Can we use IGNORE with this DBMS?
-		$sql_ignore = (strpos($db->sql_layer, 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : '';
+		$sql_ignore = (strpos($db->get_sql_layer(), 'mysql') === 0 && !defined('DEBUG')) ? 'IGNORE ' : '';
 		$insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' (';
 
 		$aliases = array();
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 5f8c0c277c..43fd6eaf07 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1532,10 +1532,10 @@ class install_install extends module
 				$_module->update_module_data($module_data, true);
 
 				// Check for last sql error happened
-				if ($db->sql_error_triggered)
+				if ($db->get_sql_error_triggered())
 				{
-					$error = $db->sql_error($db->sql_error_sql);
-					$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
+					$error = $db->sql_error($db->get_sql_error_sql());
+					$this->p_master->db_error($error['message'], $db->get_sql_error_sql(), __LINE__, __FILE__);
 				}
 
 				$categories[$cat_name]['id'] = (int) $module_data['module_id'];
@@ -1566,10 +1566,10 @@ class install_install extends module
 						$_module->update_module_data($module_data, true);
 
 						// Check for last sql error happened
-						if ($db->sql_error_triggered)
+						if ($db->get_sql_error_triggered())
 						{
-							$error = $db->sql_error($db->sql_error_sql);
-							$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
+							$error = $db->sql_error($db->get_sql_error_sql());
+							$this->p_master->db_error($error['message'], $db->get_sql_error_sql(), __LINE__, __FILE__);
 						}
 
 						$categories[$level2_name]['id'] = (int) $module_data['module_id'];
@@ -1606,10 +1606,10 @@ class install_install extends module
 						$_module->update_module_data($module_data, true);
 
 						// Check for last sql error happened
-						if ($db->sql_error_triggered)
+						if ($db->get_sql_error_triggered())
 						{
-							$error = $db->sql_error($db->sql_error_sql);
-							$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
+							$error = $db->sql_error($db->get_sql_error_sql());
+							$this->p_master->db_error($error['message'], $db->get_sql_error_sql(), __LINE__, __FILE__);
 						}
 					}
 				}
@@ -1772,10 +1772,10 @@ class install_install extends module
 						$_module->update_module_data($module_data, true);
 
 						// Check for last sql error happened
-						if ($db->sql_error_triggered)
+						if ($db->get_sql_error_triggered())
 						{
-							$error = $db->sql_error($db->sql_error_sql);
-							$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
+							$error = $db->sql_error($db->get_sql_error_sql());
+							$this->p_master->db_error($error['message'], $db->get_sql_error_sql(), __LINE__, __FILE__);
 						}
 					}
 				}
@@ -1824,10 +1824,10 @@ class install_install extends module
 				$db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $lang_pack));
 
 				$installed_languages[] = (int) $db->sql_nextid();
-				if ($db->sql_error_triggered)
+				if ($db->get_sql_error_triggered())
 				{
-					$error = $db->sql_error($db->sql_error_sql);
-					$this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__);
+					$error = $db->sql_error($db->get_sql_error_sql());
+					$this->p_master->db_error($error['message'], $db->get_sql_error_sql(), __LINE__, __FILE__);
 				}
 			}
 		}
@@ -1913,7 +1913,7 @@ class install_install extends module
 			if (!$user_id)
 			{
 				// If we can't insert this user then continue to the next one to avoid inconsistent data
-				$this->p_master->db_error('Unable to insert bot into users table', $db->sql_error_sql, __LINE__, __FILE__, true);
+				$this->p_master->db_error('Unable to insert bot into users table', $db->get_sql_error_sql(), __LINE__, __FILE__, true);
 				continue;
 			}