From 90a957ad26f52e26c3979464c5ac15b1fd0fcc28 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 17:43:43 +0200
Subject: [ticket/11015] Make DBAL classes autoloadable

PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
---
 phpBB/install/install_update.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/install/install_update.php')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index c2feaa086a..fb76420033 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -83,7 +83,6 @@ class install_update extends module
 
 		// Init DB
 		require($phpbb_root_path . 'config.' . $phpEx);
-		require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
 		require($phpbb_root_path . 'includes/constants.' . $phpEx);
 
 		// Special options for conflicts/modified files
@@ -92,7 +91,7 @@ class install_update extends module
 		define('MERGE_NEW_FILE', 3);
 		define('MERGE_MOD_FILE', 4);
 
-		$db = new $sql_db();
+		$db = new $dbms();
 
 		// Connect to DB
 		$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
-- 
cgit v1.2.1


From 5bc0f4b3d49ed1bea45464beece42906646eb026 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 17 Nov 2012 00:24:32 +0100
Subject: [ticket/11015] Move db driver class name fixing to function

PHPBB3-11015
---
 phpBB/install/install_update.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/install/install_update.php')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 7d0d627e9d..a556056382 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -91,6 +91,8 @@ class install_update extends module
 		define('MERGE_NEW_FILE', 3);
 		define('MERGE_MOD_FILE', 4);
 
+		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+
 		$db = new $dbms();
 
 		// Connect to DB
-- 
cgit v1.2.1


From 98921e0b87b25fcd5985edb747d5768cd8ccf18e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 17 Nov 2012 01:17:45 +0100
Subject: [ticket/11213] Add missing global in install_update.php

PHPBB3-11213
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/install_update.php')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 8c044550f3..7f40015002 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -71,7 +71,7 @@ class install_update extends module
 
 	function main($mode, $sub)
 	{
-		global $style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
+		global $phpbb_style, $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
 		global $request;
 
 		$this->tpl_name = 'install_update';
-- 
cgit v1.2.1


From 44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 8 Nov 2012 12:21:06 -0500
Subject: [feature/template-events] Convert a single style name to array of
 them.

This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/install/install_update.php')

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 8c044550f3..3964dbfe2b 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -131,7 +131,7 @@ class install_update extends module
 		}
 
 		// Set custom template again. ;)
-		$phpbb_style->set_custom_style('admin', '../adm/style', '');
+		$phpbb_style->set_custom_style('admin', '../adm/style', array(), '');
 
 		$template->assign_vars(array(
 			'S_USER_LANG'			=> $user->lang['USER_LANG'],
-- 
cgit v1.2.1