[Phpbb-checkins] r10070 - in /branches/phpBB-3_0_0/phpBB: install/install_install.php language/en/install.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Mon Aug 31 09:58:44 2009
New Revision: 10070

Log:
Addition to r9887: Correctly install 'Copy forum permissions' module.
Addition to r10068: Correct mode is send_statistics.

Modified:
    branches/phpBB-3_0_0/phpBB/install/install_install.php
    branches/phpBB-3_0_0/phpBB/language/en/install.php

Modified: branches/phpBB-3_0_0/phpBB/install/install_install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_install.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_install.php Mon Aug 31 09:58:44 2009
***************
*** 1958,1964 ****
  			'TITLE'		=> $lang['INSTALL_CONGRATS'],
  			'BODY'		=> sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'),
  			'L_SUBMIT'	=> $lang['INSTALL_LOGIN'],
! 			'U_ACTION'	=> append_sid($phpbb_root_path . 'adm/index.' . $phpEx, 'i=send_statistics&mode=questionnaire'),
  		));
  	}
  
--- 1958,1964 ----
  			'TITLE'		=> $lang['INSTALL_CONGRATS'],
  			'BODY'		=> sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'),
  			'L_SUBMIT'	=> $lang['INSTALL_LOGIN'],
! 			'U_ACTION'	=> append_sid($phpbb_root_path . 'adm/index.' . $phpEx, 'i=send_statistics&mode=send_statistics'),
  		));
  	}
  
***************
*** 2231,2236 ****
--- 2231,2237 ----
  			),
  			'ACP_FORUM_BASED_PERMISSIONS' => array(
  				'ACP_FORUM_PERMISSIONS',
+ 				'ACP_FORUM_PERMISSIONS_COPY',
  				'ACP_FORUM_MODERATORS',
  				'ACP_USERS_FORUM_PERMISSIONS',
  				'ACP_GROUPS_FORUM_PERMISSIONS',

Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Mon Aug 31 09:58:44 2009
***************
*** 368,374 ****
  
  // Updater
  $lang = array_merge($lang, array(
! 	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=questionnaire">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=questionnaire">Send statistics</a> module in your ACP.',
  	'ARCHIVE_FILE'				=> 'Source file within archive',
  
  	'BACK'				=> 'Back',
--- 368,374 ----
  
  // Updater
  $lang = array_merge($lang, array(
! 	'ALL_FILES_UP_TO_DATE'		=> 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
  	'ARCHIVE_FILE'				=> 'Source file within archive',
  
  	'BACK'				=> 'Back',