mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 23:45:20 +02:00
Code Issues Releases Wiki Activity

[ticket/14584] Change all to be removed tags to 4.0

Browse Source 
PHPBB3-14584
This commit is contained in:
Máté Bartus 2016-04-06 22:44:31 +02:00 committed by Marc Alexander
parent 7a831c3e28
commit cfaf24bd45
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/includes/functions_compatibility.php
View File

@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
/** /**
* Get user avatar * Get user avatar
* *
* @deprecated 3.1.0-a1 (To be removed: 3.3.0) * @deprecated 3.1.0-a1 (To be removed: 4.0.0)
* *
* @param string $avatar Users assigned avatar name * @param string $avatar Users assigned avatar name
* @param int $avatar_type Type of avatar * @param int $avatar_type Type of avatar
@ -50,7 +50,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
/** /**
* Hash the password * Hash the password
* *
* @deprecated 3.1.0-a2 (To be removed: 3.3.0) * @deprecated 3.1.0-a2 (To be removed: 4.0.0)
* *
* @param string $password Password to be hashed * @param string $password Password to be hashed
* *
@ -68,7 +68,7 @@ function phpbb_hash($password)
/** /**
* Check for correct password * Check for correct password
* *
* @deprecated 3.1.0-a2 (To be removed: 3.3.0) * @deprecated 3.1.0-a2 (To be removed: 4.0.0)
* *
* @param string $password The password in plain text * @param string $password The password in plain text
* @param string $hash The stored password hash * @param string $hash The stored password hash
@ -92,7 +92,7 @@ function phpbb_check_hash($password, $hash)
* @param string $path Path to clean * @param string $path Path to clean
* @return string Cleaned path * @return string Cleaned path
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function phpbb_clean_path($path) function phpbb_clean_path($path)
{ {
@ -136,7 +136,7 @@ function phpbb_clean_path($path)
* *
* @return string Returns the options for timezone selector only * @return string Returns the options for timezone selector only
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function tz_select($default = '', $truncate = false) function tz_select($default = '', $truncate = false)
{ {
@ -150,7 +150,7 @@ function tz_select($default = '', $truncate = false)
* via admin_permissions. Changes of usernames and group names * via admin_permissions. Changes of usernames and group names
* must be carried through for the moderators table. * must be carried through for the moderators table.
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
* @return null * @return null
*/ */
function cache_moderators() function cache_moderators()
@ -162,7 +162,7 @@ function cache_moderators()
/** /**
* Removes moderators and administrators from foe lists. * Removes moderators and administrators from foe lists.
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
* @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore * @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore
* @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore * @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
* @return null * @return null
@ -182,7 +182,7 @@ function update_foes($group_id = false, $user_id = false)
* @param string &$rank_img the rank image as full img tag is stored here after execution * @param string &$rank_img the rank image as full img tag is stored here after execution
* @param string &$rank_img_src the rank image source is stored here after execution * @param string &$rank_img_src the rank image source is stored here after execution
* *
* @deprecated 3.1.0-RC5 (To be removed: 3.3.0) * @deprecated 3.1.0-RC5 (To be removed: 4.0.0)
* *
* Note: since we do not want to break backwards-compatibility, this function will only properly assign ranks to guests if you call it for them with user_posts == false * Note: since we do not want to break backwards-compatibility, this function will only properly assign ranks to guests if you call it for them with user_posts == false
*/ */
@ -232,7 +232,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
* *
* @return int|bool Returns the log_id, if the entry was added to the database, false otherwise. * @return int|bool Returns the log_id, if the entry was added to the database, false otherwise.
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function add_log() function add_log()
{ {
@ -280,7 +280,7 @@ function add_log()
* *
* @return null * @return null
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\config\config $set_config = null) function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\config\config $set_config = null)
{ {
@ -310,7 +310,7 @@ function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\con
* *
* @return null * @return null
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\config\config $set_config = null) function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\config\config $set_config = null)
{ {
@ -331,7 +331,7 @@ function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\
* See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for * See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for
* documentation of this function's use. * documentation of this function's use.
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
* @param mixed $var_name The form variable's name from which data shall be retrieved. * @param mixed $var_name The form variable's name from which data shall be retrieved.
* If the value is an array this may be an array of indizes which will give * If the value is an array this may be an array of indizes which will give
* direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a") * direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
@ -389,7 +389,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $
/** /**
* Get tables of a database * Get tables of a database
* *
* @deprecated 3.1.0 (To be removed: 3.3.0) * @deprecated 3.1.0 (To be removed: 4.0.0)
*/ */
function get_tables($db) function get_tables($db)
{ {
@ -492,7 +492,7 @@ function phpbb_realpath($path)
* @param $number int|float The number we want to get the plural case for. Float numbers are floored. * @param $number int|float The number we want to get the plural case for. Float numbers are floored.
* @return int The plural-case we need to use for the number plural-rule combination * @return int The plural-case we need to use for the number plural-rule combination
* *
* @deprecated 3.2.0-dev (To be removed: 3.3.0) * @deprecated 3.2.0-dev (To be removed: 4.0.0)
*/ */
function phpbb_get_plural_form($rule, $number) function phpbb_get_plural_form($rule, $number)
{ {
@ -515,7 +515,7 @@ function phpbb_pcre_utf8_support()
/** /**
* Casts a variable to the given type. * Casts a variable to the given type.
* *
* @deprecated 3.3.0-dev (To be removed 3.4.0) * @deprecated 3.1 (To be removed 4.0.0)
*/ */
function set_var(&$result, $var, $type, $multibyte = false) function set_var(&$result, $var, $type, $multibyte = false)
{ {
@ -527,7 +527,7 @@ function set_var(&$result, $var, $type, $multibyte = false)
/** /**
* Delete Attachments * Delete Attachments
* *
* @deprecated 3.2.0-a1 (To be removed: 3.4.0) * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
* *
* @param string $mode can be: post|message|topic|attach|user * @param string $mode can be: post|message|topic|attach|user
* @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids * @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids
@ -549,7 +549,7 @@ function delete_attachments($mode, $ids, $resync = true)
/** /**
* Delete attached file * Delete attached file
* *
* @deprecated 3.2.0-a1 (To be removed: 3.4.0) * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
*/ */
function phpbb_unlink($filename, $mode = 'file', $entry_removed = false) function phpbb_unlink($filename, $mode = 'file', $entry_removed = false)
{ {
@ -566,7 +566,7 @@ function phpbb_unlink($filename, $mode = 'file', $entry_removed = false)
/** /**
* Display reasons * Display reasons
* *
* @deprecated 3.2.0-dev (To be removed: 3.4.0) * @deprecated 3.2.0-dev (To be removed: 4.0.0)
*/ */
function display_reasons($reason_id = 0) function display_reasons($reason_id = 0)
{ {
@ -579,7 +579,7 @@ function display_reasons($reason_id = 0)
* Upload Attachment - filedata is generated here * Upload Attachment - filedata is generated here
* Uses upload class * Uses upload class
* *
* @deprecated 3.2.0-a1 (To be removed: 3.4.0) * @deprecated 3.2.0-a1 (To be removed: 4.0.0)
* *
* @param string $form_name The form name of the file upload input * @param string $form_name The form name of the file upload input
* @param int $forum_id The id of the forum * @param int $forum_id The id of the forum

2
phpBB/phpbb/controller/helper.php
View File

@ -121,7 +121,7 @@ class helper
* @param int $code The error code (e.g. 404, 500, 503, etc.) * @param int $code The error code (e.g. 404, 500, 503, etc.)
* @return Response A Response instance * @return Response A Response instance
* *
* @deprecated 3.1.3 (To be removed: 3.3.0) Use exceptions instead. * @deprecated 3.1.3 (To be removed: 4.0.0) Use exceptions instead.
*/ */
public function error($message, $code = 500) public function error($message, $code = 500)
{ {

2
phpBB/phpbb/filesystem.php
View File

@ -14,7 +14,7 @@
namespace phpbb; namespace phpbb;
/** /**
* @deprecated 3.2.0-dev (To be removed 3.3.0) use \phpbb\filesystem\filesystem instead * @deprecated 3.2.0-dev (To be removed 4.0.0) use \phpbb\filesystem\filesystem instead
*/ */
class filesystem extends \phpbb\filesystem\filesystem class filesystem extends \phpbb\filesystem\filesystem
{ {

12
phpBB/phpbb/user.php
View File

@ -446,7 +446,7 @@ class user extends \phpbb\session
* @return int|bool The plural-case we need to use for the number plural-rule combination, false if $force_rule * @return int|bool The plural-case we need to use for the number plural-rule combination, false if $force_rule
* was invalid. * was invalid.
* *
* @deprecated: 3.2.0-dev (To be removed: 3.3.0) * @deprecated: 3.2.0-dev (To be removed: 4.0.0)
*/ */
function get_plural_form($number, $force_rule = false) function get_plural_form($number, $force_rule = false)
{ {
@ -457,8 +457,8 @@ class user extends \phpbb\session
* Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion) * Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion)
* *
* @param mixed $lang_set specifies the language entries to include * @param mixed $lang_set specifies the language entries to include
* @param bool $use_db internal variable for recursion, do not use @deprecated 3.2.0-dev (To be removed: 3.3.0) * @param bool $use_db internal variable for recursion, do not use @deprecated 3.2.0-dev (To be removed: 4.0.0)
* @param bool $use_help internal variable for recursion, do not use @deprecated 3.2.0-dev (To be removed: 3.3.0) * @param bool $use_help internal variable for recursion, do not use @deprecated 3.2.0-dev (To be removed: 4.0.0)
* @param string $ext_name The extension to load language from, or empty for core files * @param string $ext_name The extension to load language from, or empty for core files
* *
* Examples: * Examples:
@ -473,7 +473,7 @@ class user extends \phpbb\session
* Note: $use_db and $use_help should be removed. The old function was kept for BC purposes, * Note: $use_db and $use_help should be removed. The old function was kept for BC purposes,
* so the BC logic is handled here. * so the BC logic is handled here.
* *
* @deprecated: 3.2.0-dev (To be removed: 3.3.0) * @deprecated: 3.2.0-dev (To be removed: 4.0.0)
*/ */
function add_lang($lang_set, $use_db = false, $use_help = false, $ext_name = '') function add_lang($lang_set, $use_db = false, $use_help = false, $ext_name = '')
{ {
@ -514,7 +514,7 @@ class user extends \phpbb\session
/** /**
* BC function for loading language files * BC function for loading language files
* *
* @deprecated 3.2.0-dev (To be removed: 3.3.0) * @deprecated 3.2.0-dev (To be removed: 4.0.0)
*/ */
private function set_lang($lang_set, $use_help, $ext_name) private function set_lang($lang_set, $use_help, $ext_name)
{ {
@ -550,7 +550,7 @@ class user extends \phpbb\session
* *
* Note: $use_db and $use_help should be removed. Kept for BC purposes. * Note: $use_db and $use_help should be removed. Kept for BC purposes.
* *
* @deprecated: 3.2.0-dev (To be removed: 3.3.0) * @deprecated: 3.2.0-dev (To be removed: 4.0.0)
*/ */
function add_lang_ext($ext_name, $lang_set, $use_db = false, $use_help = false) function add_lang_ext($ext_name, $lang_set, $use_db = false, $use_help = false)
{ {