diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
| commit | bb3c9a26bb75c76c5934d327548bf08606467b9f (patch) | |
| tree | 26760aa866799fc70683ef6845bf54fb17bdc955 /actions | |
| parent | 2feedf39f6484879333a7b77fdc3c184150db8c7 (diff) | |
| parent | 398572fd96c72b363fd5a252fb9cbe1cecab1e04 (diff) | |
| download | elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.gz elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.bz2 | |
Merge branch 'floxglove-3' into saravea
Conflicts:
.gitmodules
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/profile/edit.php | 4 | ||||
| -rw-r--r-- | actions/register.php | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/actions/profile/edit.php b/actions/profile/edit.php index 89bf2bc0b..63fb31600 100644 --- a/actions/profile/edit.php +++ b/actions/profile/edit.php @@ -48,6 +48,10 @@ foreach ($profile_fields as $shortname => $valuetype) { forward(REFERER); } + if ($valuetype == 'url' && !preg_match('~^https?\://~i', $value)) { + $value = "http://$value"; + } + if ($valuetype == 'tags') { $value = string_to_tag_array($value); } diff --git a/actions/register.php b/actions/register.php index 810ceaf27..73926232c 100644 --- a/actions/register.php +++ b/actions/register.php @@ -45,7 +45,9 @@ if (elgg_get_config('allow_registration')) { // @todo should registration be allowed no matter what the plugins return? if (!elgg_trigger_plugin_hook('register', 'user', $params, TRUE)) { + $ia = elgg_set_ignore_access(true); $new_user->delete(); + elgg_set_ignore_access($ia); // @todo this is a generic messages. We could have plugins // throw a RegistrationException, but that is very odd // for the plugin hooks system. |