1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
This commit is contained in:
Tristan Darricau
2017-04-18 23:15:10 +02:00
3 changed files with 42 additions and 21 deletions

View File

@@ -577,6 +577,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,
'BOARD_VERSION' => $config['version'],
'U_ACTION' => $this->u_action,