aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-07 08:05:14 -0400
committerCash Costello <cash.costello@gmail.com>2011-10-07 08:05:14 -0400
commit996a185c557357ccd3f5c257d17699eb874e1898 (patch)
treea264a21bff5c72b0d2ce0af84d3bb7d81a1495ea /views/default/admin
parent41256f644b02bf4dcb2bc3798bdf470fa93515da (diff)
downloadelgg-996a185c557357ccd3f5c257d17699eb874e1898.tar.gz
elgg-996a185c557357ccd3f5c257d17699eb874e1898.tar.bz2
Fixes #3644 localized profile field names
Diffstat (limited to 'views/default/admin')
-rw-r--r--views/default/admin/appearance/profile_fields/list.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 542ab1b6f..6e79838ea 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -9,15 +9,18 @@
$n = 0;
$loaded_defaults = array();
$items = array();
-if ($fieldlist = elgg_get_config('profile_custom_fields')) {
+$fieldlist = elgg_get_config('profile_custom_fields');
+if ($fieldlist) {
$fieldlistarray = explode(',', $fieldlist);
foreach ($fieldlistarray as $listitem) {
- if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
+ $translation = elgg_get_config("admin_defined_profile_$listitem");
+ $type = elgg_get_config("admin_defined_profile_type_$listitem");
+ if ($translation && $type) {
$item = new stdClass;
$item->translation = $translation;
$item->shortname = $listitem;
- $item->name = "admin_defined_profile_{$listitem}";
- $item->type = elgg_get_config("admin_defined_profile_type_{$listitem}");
+ $item->name = "admin_defined_profile_$listitem";
+ $item->type = elgg_echo("profile:field:$type");
$items[] = $item;
}
}