diff options
author | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:41:42 +0100 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:41:42 +0100 |
commit | 809d73ca5eae048801d0aff7b0214d11edf90fc1 (patch) | |
tree | a66c34ed98b8ffa4b4e6ad2bf3fcbafff7f33b09 /phpBB/phpbb | |
parent | 7d7aa9d119129a0489724cd5dbab1600c541a696 (diff) | |
parent | 230e737790cb8f6ecd35dcb88c86ce3e60a587b8 (diff) | |
download | forums-809d73ca5eae048801d0aff7b0214d11edf90fc1.tar forums-809d73ca5eae048801d0aff7b0214d11edf90fc1.tar.gz forums-809d73ca5eae048801d0aff7b0214d11edf90fc1.tar.bz2 forums-809d73ca5eae048801d0aff7b0214d11edf90fc1.tar.xz forums-809d73ca5eae048801d0aff7b0214d11edf90fc1.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14889] Missing method in profile fields type interface
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/profilefields/type/type_interface.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php index ec770f9467..93b9e4b893 100644 --- a/phpBB/phpbb/profilefields/type/type_interface.php +++ b/phpBB/phpbb/profilefields/type/type_interface.php @@ -134,6 +134,14 @@ interface type_interface public function get_field_ident($field_data); /** + * Get the localized name of the field + * + * @param string $field_name Unlocalized name of this field + * @return string Localized name of the field + */ + public function get_field_name($field_name); + + /** * Get the column type for the database * * @return string Returns the database column type |