From c06f4756eca4dfbbdad8984a62976745aeb183dd Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 13:44:42 -0700 Subject: [ticket/15097] Add PHP version to Board statistics The ACP main page shows the phpBB version and the database version, but didn't show the PHP version. With this change the PHP version is displayed as part of the Board statistics. PHPBB3-15097 --- phpBB/includes/acp/acp_main.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/includes/acp/acp_main.php') diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 6e7bd91a86..0c750abc0a 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,6 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), + 'PHP_VERSION' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, -- cgit v1.2.1 From c30ad4ce60267a1301a406c3d0279f95b856f5a5 Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 14:19:18 -0700 Subject: [ticket/15097] Add PHP version to Board statistics Rework commit message per DavidIQ's guidance and change variable name to avoid confusion PHPBB3-15907 --- phpBB/includes/acp/acp_main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/acp/acp_main.php') diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 0c750abc0a..c611db5759 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,7 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), - 'PHP_VERSION' => PHP_VERSION, + 'PHP_VERSION_INFO' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, -- cgit v1.2.1 From 65513c79f57d7e10dcc973d094bf723673738ada Mon Sep 17 00:00:00 2001 From: nomind60s Date: Fri, 17 Feb 2017 16:15:00 -0700 Subject: [ticket/15097] Resolve travis-ci error Make sure indentation is using tabs not spaces per code guidelines PHPBB3-15097 --- phpBB/includes/acp/acp_main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/acp/acp_main.php') diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index c611db5759..d40cda0358 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -569,7 +569,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), - 'PHP_VERSION_INFO' => PHP_VERSION, + 'PHP_VERSION_INFO' => PHP_VERSION, 'BOARD_VERSION' => $config['version'], 'U_ACTION' => $this->u_action, -- cgit v1.2.1