From 7251feab67d8e457c052ac0bcd05f8b685d1d56c Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 30 Oct 2013 15:42:35 -0700
Subject: [ticket/11987] Change {ROOT_PATH} to point to board root.

PHPBB3-11987
---
 phpBB/includes/functions_acp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_acp.php')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index c83bc1f7a6..774fca7d12 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -67,7 +67,7 @@ function adm_page_header($page_title)
 		'SID'					=> $SID,
 		'_SID'					=> $_SID,
 		'SESSION_ID'			=> $user->session_id,
-		'ROOT_PATH'				=> $phpbb_admin_path,
+		'ROOT_PATH'				=> $phpbb_root_path,
 
 		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
 		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),
-- 
cgit v1.2.1


From 831075e5fe48849e226009ce3d53c396d75675f0 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 30 Oct 2013 16:13:20 -0700
Subject: [ticket/11987] Add {ADMIN_ROOT_PATH}.

PHPBB3-11987
---
 phpBB/includes/functions_acp.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes/functions_acp.php')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 774fca7d12..b9210114ef 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -68,6 +68,7 @@ function adm_page_header($page_title)
 		'_SID'					=> $_SID,
 		'SESSION_ID'			=> $user->session_id,
 		'ROOT_PATH'				=> $phpbb_root_path,
+		'ADMIN_ROOT_PATH'		=> $phpbb_admin_path,
 
 		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
 		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),
-- 
cgit v1.2.1


From 3a00cb0c081efff55fd7b1c55c8990c8682e7b8d Mon Sep 17 00:00:00 2001
From: Mario Skouat <mario@skouat.org>
Date: Sat, 23 Mar 2013 13:48:46 +0100
Subject: [ticket/10910] Allow setting size selects in build_cfg_template()

PHPBB3-10910
---
 phpBB/includes/functions_acp.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_acp.php')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index b9210114ef..ca116372ba 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -363,7 +363,9 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 
 			if ($tpl_type[0] == 'select')
 			{
-				$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>';
+				$size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1;
+
+				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>';
 			}
 			else
 			{
-- 
cgit v1.2.1


From 2f4d15015e7a0e8d8f9a76b60c5c8c0091e399ca Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 22 Nov 2013 15:51:56 +0100
Subject: [ticket/10910] Do not add size when its 1 (default)

PHPBB3-10910
---
 phpBB/includes/functions_acp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_acp.php')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index ca116372ba..cb44ed2794 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -365,7 +365,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			{
 				$size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1;
 
-				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>';
+				$tpl = '<select id="' . $key . '" name="' . $name . '"' . (($size > 1) ? ' size="' . $size . '"' : '') . '>' . $return . '</select>';
 			}
 			else
 			{
-- 
cgit v1.2.1