diff options
| author | Sem <sembrestels@riseup.net> | 2012-11-18 16:07:31 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-11-18 16:07:31 +0100 |
| commit | 7f4f57ef1ebd8b97370094da2518dd39e183a43d (patch) | |
| tree | e0a8518ee22c334ce5741c9247403cf09d179ec4 /views | |
| parent | 47aa87219deb97da16eabe03dee9179999faf2d7 (diff) | |
| parent | 6623571b615fc5c9d1b82e2607de4cdaee8a818b (diff) | |
| download | elgg-7f4f57ef1ebd8b97370094da2518dd39e183a43d.tar.gz elgg-7f4f57ef1ebd8b97370094da2518dd39e183a43d.tar.bz2 | |
Merge tag '1.8.9' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.9 release
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/forms/profile/edit.php | 3 | ||||
| -rw-r--r-- | views/default/object/plugin/elements/dependencies.php | 2 | ||||
| -rw-r--r-- | views/default/output/email.php | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php index 222935344..9538b779e 100644 --- a/views/default/forms/profile/edit.php +++ b/views/default/forms/profile/edit.php @@ -18,7 +18,8 @@ if (is_array($profile_fields) && count($profile_fields) > 0) { foreach ($profile_fields as $shortname => $valtype) { $metadata = elgg_get_metadata(array( 'guid' => $vars['entity']->guid, - 'metadata_name' => $shortname + 'metadata_name' => $shortname, + 'limit' => false )); if ($metadata) { if (is_array($metadata)) { diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php index 8abd61692..d8daedd33 100644 --- a/views/default/object/plugin/elements/dependencies.php +++ b/views/default/object/plugin/elements/dependencies.php @@ -29,6 +29,8 @@ foreach ($deps as $dep) { if ($dep['status']) { $class = "elgg-state-success elgg-dependency elgg-dependency-$type"; + } elseif ($dep['type'] == 'suggests') { + $class = "elgg-state-warning elgg-dependency elgg-dependency-$type"; } else { $class = "elgg-state-error elgg-dependency elgg-dependency-$type"; } diff --git a/views/default/output/email.php b/views/default/output/email.php index 00eefad1f..f5a8bc4b8 100644 --- a/views/default/output/email.php +++ b/views/default/output/email.php @@ -10,6 +10,8 @@ * */ +$encoded_value = htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8'); + if (!empty($vars['value'])) { - echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false) ."</a>"; + echo "<a href=\"mailto:$encoded_value\">$encoded_value</a>"; }
\ No newline at end of file |