From da2752e4004b296ae5acdd08b7c0a758d8f61e9d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 13:30:52 -0400
Subject: [ticket/11700] Modify all code to use the new interface names

PHPBB3-11700
---
 phpBB/phpbb/log/log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/log/log.php')

diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 7a26858348..0a755b5c78 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpbb_log
 */
-class phpbb_log implements phpbb_log_interface
+class phpbb_log implements phpbb_log_log_interface
 {
 	/**
 	* If set, administrative user profile links will be returned and messages
-- 
cgit v1.2.1


From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 10 Sep 2013 14:01:09 +0200
Subject: [ticket/11700] Move all recent code to namespaces

PHPBB3-11700
---
 phpBB/phpbb/log/log.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'phpBB/phpbb/log/log.php')

diff --git a/phpBB/phpbb/log/log.php b/phpBB/phpbb/log/log.php
index 0a755b5c78..7f4e52ed39 100644
--- a/phpBB/phpbb/log/log.php
+++ b/phpBB/phpbb/log/log.php
@@ -1,12 +1,14 @@
 <?php
 /**
 *
-* @package phpbb_log
+* @package \phpbb\log\log
 * @copyright (c) 2012 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
+namespace phpbb\log;
+
 /**
 * @ignore
 */
@@ -18,9 +20,9 @@ if (!defined('IN_PHPBB'))
 /**
 * This class is used to add entries into the log table.
 *
-* @package phpbb_log
+* @package \phpbb\log\log
 */
-class phpbb_log implements phpbb_log_log_interface
+class log implements \phpbb\log\log_interface
 {
 	/**
 	* If set, administrative user profile links will be returned and messages
@@ -56,19 +58,19 @@ class phpbb_log implements phpbb_log_log_interface
 
 	/**
 	* Database object
-	* @var phpbb_db_driver
+	* @var \phpbb\db\driver\driver
 	*/
 	protected $db;
 
 	/**
 	* User object
-	* @var phpbb_user
+	* @var \phpbb\user
 	*/
 	protected $user;
 
 	/**
 	* Auth object
-	* @var phpbb_auth
+	* @var \phpbb\auth\auth
 	*/
 	protected $auth;
 
@@ -99,9 +101,9 @@ class phpbb_log implements phpbb_log_log_interface
 	/**
 	* Constructor
 	*
-	* @param	phpbb_db_driver	$db		Database object
-	* @param	phpbb_user		$user	User object
-	* @param	phpbb_auth		$auth	Auth object
+	* @param	\phpbb\db\driver\driver	$db		Database object
+	* @param	\phpbb\user		$user	User object
+	* @param	\phpbb\auth\auth		$auth	Auth object
 	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
 	* @param	string		$phpbb_root_path		Root path
 	* @param	string		$relative_admin_path	Relative admin root path
@@ -123,7 +125,7 @@ class phpbb_log implements phpbb_log_log_interface
 		/*
 		* IN_ADMIN is set after the session is created,
 		* so we need to take ADMIN_START into account as well, otherwise
-		* it will not work for the phpbb_log object we create in common.php
+		* it will not work for the \phpbb\log\log object we create in common.php
 		*/
 		$this->set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN));
 		$this->enable();
-- 
cgit v1.2.1