From a8c22829d8e8845cd4ddf4ef8b61a1ed79edfffc Mon Sep 17 00:00:00 2001
From: Olivier Gayot <duskcoder@gmail.com>
Date: Mon, 12 Mar 2018 22:57:42 +0100
Subject: Imported from the SVN repository

http://svn.wolffelaar.nl/wsvn/phpbb/branches/jessie/

Signed-off-by: Olivier Gayot <duskcoder@gmail.com>
---
 debian/patches/011_fix_version_display.patch | 72 ++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 debian/patches/011_fix_version_display.patch

(limited to 'debian/patches/011_fix_version_display.patch')

diff --git a/debian/patches/011_fix_version_display.patch b/debian/patches/011_fix_version_display.patch
new file mode 100644
index 0000000..00ff4fd
--- /dev/null
+++ b/debian/patches/011_fix_version_display.patch
@@ -0,0 +1,72 @@
+Author: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
+Description: Overrides the version display, such that it is clear a Debian package is used.
+Last-Update: 2013-09-28
+--- a/adm/index.php
++++ b/adm/index.php
+@@ -200,7 +200,7 @@
+ 		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
+ 		'S_COPYRIGHT_HTML'	=> $copyright_html,
+ 		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
+-		'VERSION'			=> $config['version'])
++		'VERSION'			=> PHPBB_VERSION)
+ 	);
+ 
+ 	$template->display('body');
+--- a/common.php
++++ b/common.php
+@@ -16,6 +16,8 @@
+ 	exit;
+ }
+ 
++define('PHPBB_VERSION', '@VERSION@');
++
+ require($phpbb_root_path . 'includes/startup.' . $phpEx);
+ 
+ if (file_exists($phpbb_root_path . 'config.' . $phpEx))
+--- a/includes/acp/acp_styles.php
++++ b/includes/acp/acp_styles.php
+@@ -2034,7 +2034,7 @@
+ 
+ 			if ($mode == 'style')
+ 			{
+-				$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], $config['version']), $this->style_cfg);
++				$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], PHPBB_VERSION), $this->style_cfg);
+ 
+ 				$style_cfg .= (!$inc_template) ? "\nrequired_template = {$style_row['template_name']}" : '';
+ 				$style_cfg .= (!$inc_theme) ? "\nrequired_theme = {$style_row['theme_name']}" : '';
+@@ -2065,7 +2065,7 @@
+ 					$db->sql_freeresult($result);
+ 				}
+ 
+-				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg);
++				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], PHPBB_VERSION, $use_template_name), $this->template_cfg);
+ 
+ 				$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
+ 
+@@ -2106,7 +2106,7 @@
+ 			// Export theme core code
+ 			if ($mode == 'theme' || $inc_theme)
+ 			{
+-				$theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], $config['version']), $this->theme_cfg);
++				$theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], PHPBB_VERSION), $this->theme_cfg);
+ 
+ 				// Read old cfg file
+ 				$items = $cache->obtain_cfg_items($style_row);
+@@ -2145,7 +2145,7 @@
+ 			// Export imageset core code
+ 			if ($mode == 'imageset' || $inc_imageset)
+ 			{
+-				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg);
++				$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], PHPBB_VERSION), $this->imageset_cfg);
+ 
+ 				$imageset_main = array();
+ 
+@@ -2214,7 +2214,7 @@
+ 
+ 				foreach ($imageset_lang as $lang => $imageset_localized)
+ 				{
+-					$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg);
++					$imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], PHPBB_VERSION), $this->imageset_cfg);
+ 
+ 					foreach ($this->imageset_keys as $topic => $key_array)
+ 					{
-- 
cgit v1.2.3