From 6b561b9eae320b06178725fdccbc3e67c0990837 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 18 Oct 2015 11:30:09 +0200
Subject: [PATCH] [ticket/14039] Use compatibility globals from the update
 package

PHPBB3-14039
---
 phpBB/phpbb/install/helper/container_factory.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/phpBB/phpbb/install/helper/container_factory.php b/phpBB/phpbb/install/helper/container_factory.php
index fd42d53c00..8c007de39f 100644
--- a/phpBB/phpbb/install/helper/container_factory.php
+++ b/phpBB/phpbb/install/helper/container_factory.php
@@ -168,6 +168,13 @@ class container_factory
 		}
 
 		// Get compatibilty globals
-		require ($this->phpbb_root_path . 'includes/compatibility_globals.' . $this->php_ext);
+		if (file_exists($this->phpbb_root_path . 'install/update/new/includes/compatibility_globals.' . $this->php_ext))
+		{
+			require($this->phpbb_root_path . 'install/update/new/includes/compatibility_globals.' . $this->php_ext);
+		}
+		else
+		{
+			require($this->phpbb_root_path . 'includes/compatibility_globals.' . $this->php_ext);
+		}
 	}
 }