From 28e98466d959875d2f5b0e917c32783c1039dc23 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 12:26:02 -0700
Subject: [PATCH] [ticket/11620] Changes to match merge

PHPBB3-11620
---
 tests/session/fixtures/sessions_full.xml | 3 +++
 tests/session/testable_facade.php        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
index 509687f4d2..6bbaf1c9d5 100644
--- a/tests/session/fixtures/sessions_full.xml
+++ b/tests/session/fixtures/sessions_full.xml
@@ -37,17 +37,20 @@
 		<column>session_user_id</column>
 		<column>session_ip</column>
 		<column>session_browser</column>
+		<column>session_admin</column>
 		<row>
 			<value>anon_session00000000000000000000</value>
 			<value>1</value>
 			<value>127.0.0.1</value>
 			<value>anonymous user agent</value>
+			<value>0</value>
 		</row>
 		<row>
 			<value>bar_session000000000000000000000</value>
 			<value>4</value>
 			<value>127.0.0.1</value>
 			<value>user agent</value>
+			<value>1</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 1343b34a79..c5e58fce05 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -8,7 +8,7 @@
  */
 
 require_once dirname(__FILE__) . '/testable_factory.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php';
 
 /**
  * This class exists to expose session.php's functions in a more testable way.