diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-06 23:28:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-06 23:28:10 +0200 |
| commit | 61bc6c4c676e3607528aaa0accbdfa352b9567ec (patch) | |
| tree | 1fac55a1780d7a4580af5172a14bac5d633741f8 /phpBB | |
| parent | ae4069acbdafbbe536fa1976ca042324571aac63 (diff) | |
| parent | 0328bc38a478415d3eff74c50b15daa901266f12 (diff) | |
| download | forums-61bc6c4c676e3607528aaa0accbdfa352b9567ec.tar forums-61bc6c4c676e3607528aaa0accbdfa352b9567ec.tar.gz forums-61bc6c4c676e3607528aaa0accbdfa352b9567ec.tar.bz2 forums-61bc6c4c676e3607528aaa0accbdfa352b9567ec.tar.xz forums-61bc6c4c676e3607528aaa0accbdfa352b9567ec.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12910] Set get_name for Google+ fields
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_googleplus.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_googleplus.php b/phpBB/phpbb/profilefields/type/type_googleplus.php index df1bcc7f4b..887baa3de1 100644 --- a/phpBB/phpbb/profilefields/type/type_googleplus.php +++ b/phpBB/phpbb/profilefields/type/type_googleplus.php @@ -18,6 +18,14 @@ class type_googleplus extends type_string /** * {@inheritDoc} */ + public function get_name() + { + return $this->user->lang('FIELD_GOOGLEPLUS'); + } + + /** + * {@inheritDoc} + */ public function get_service_name() { return 'profilefields.type.googleplus'; |