mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

Browse Source 
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Nils Adermann
2014-02-02 16:34:55 +01:00
parent 8a6b961c54 a59d6e94a5
commit 38af79dd30
42 changed files with 3021 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
*/
function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
{
global $user, $template, $auth, $db, $cache;
global $user, $template, $auth, $db, $cache, $phpbb_container;
global $phpbb_root_path, $request, $phpEx, $config, $phpbb_dispatcher;
$user->add_lang(array('viewtopic', 'memberlist'));
@@ -61,11 +61,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// Load the custom profile fields
if ($config['load_cpf_pm'])
{
if (!class_exists('custom_profile'))
{
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields.manager');
$profile_fields = $cp->generate_profile_fields_template('grab', $author_id);
}

7
phpBB/includes/ucp/ucp_profile.php
View File

@@ -29,8 +29,7 @@ class ucp_profile
function main($id, $mode)
{
global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request;
global $phpbb_container;
global $request, $phpbb_container;
$user->add_lang('posting');
@@ -260,9 +259,7 @@ class ucp_profile
trigger_error('NO_AUTH_PROFILEINFO');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields.manager');
$cp_data = $cp_error = array();

4
phpBB/includes/ucp/ucp_register.php
View File

@@ -35,8 +35,6 @@ class ucp_register
trigger_error('UCP_REGISTER_DISABLE');
}
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$coppa = $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
$agreed = $request->variable('agreed', false);
$submit = $request->is_set_post('submit');
@@ -78,7 +76,7 @@ class ucp_register
}
}
$cp = new custom_profile();
$cp = $phpbb_container->get('profilefields.manager');
$error = $cp_data = $cp_error = array();
$s_hidden_fields = array();