diff options
author | Igor Wiedler <igor@wiedler.ch> | 2011-02-13 18:33:27 +0100 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2011-02-13 18:33:27 +0100 |
commit | 1cc5087c36c58cde214360c96d9c7b45dc6c4db0 (patch) | |
tree | 4c6f78587361c25980533ffc2b744ae3f40d1dbd | |
parent | 04bd2e640e771948671ab6554df8962de980f511 (diff) | |
parent | ecb29e6027ef0ef7c551f22745aa68e3f96d83ac (diff) | |
download | forums-1cc5087c36c58cde214360c96d9c7b45dc6c4db0.tar forums-1cc5087c36c58cde214360c96d9c7b45dc6c4db0.tar.gz forums-1cc5087c36c58cde214360c96d9c7b45dc6c4db0.tar.bz2 forums-1cc5087c36c58cde214360c96d9c7b45dc6c4db0.tar.xz forums-1cc5087c36c58cde214360c96d9c7b45dc6c4db0.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/8904] Show default value for numeric custom profile fields when editing
-rw-r--r-- | phpBB/includes/acp/acp_profile.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index bd3435a226..ca6a5f04d2 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -515,7 +515,7 @@ class acp_profile else if ($field_type == FIELD_INT && $key == 'field_default_value') { // Permit an empty string - if (request_var('field_default_value', '') === '') + if ($action == 'create' && request_var('field_default_value', '') === '') { $var = ''; } |