aboutsummaryrefslogtreecommitdiff
path: root/mod/profile
diff options
context:
space:
mode:
Diffstat (limited to 'mod/profile')
-rw-r--r--mod/profile/start.php8
-rw-r--r--mod/profile/views/default/profile/details.php6
-rw-r--r--mod/profile/views/default/profile/owner_block.php2
3 files changed, 9 insertions, 7 deletions
diff --git a/mod/profile/start.php b/mod/profile/start.php
index d91b66371..2c38fdd2d 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -7,6 +7,10 @@
elgg_register_event_handler('init', 'system', 'profile_init', 1);
+// Metadata on users needs to be independent
+// outside of init so it happens earlier in boot. See #3316
+register_metadata_as_independent('user');
+
/**
* Profile init function
*/
@@ -16,8 +20,6 @@ function profile_init() {
// will dictate the URL for all ElggUser objects
elgg_register_entity_url_handler('user', 'all', 'profile_url');
- // Metadata on users needs to be independent
- register_metadata_as_independent('user');
elgg_register_simplecache_view('icon/user/default/tiny');
elgg_register_simplecache_view('icon/user/default/topbar');
@@ -127,4 +129,4 @@ function profile_default_widgets_hook($hook, $type, $return, $params) {
);
return $return;
-} \ No newline at end of file
+}
diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php
index 04d95001d..3af5cb756 100644
--- a/mod/profile/views/default/profile/details.php
+++ b/mod/profile/views/default/profile/details.php
@@ -25,12 +25,12 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
//This function controls the alternating class
$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
?>
- <p class="<?php echo $even_odd; ?>">
+ <div class="<?php echo $even_odd; ?>">
<b><?php echo elgg_echo("profile:{$shortname}"); ?>: </b>
<?php
echo elgg_view("output/{$valtype}", array('value' => $user->$shortname));
?>
- </p>
+ </div>
<?php
}
}
@@ -45,7 +45,7 @@ if (!elgg_get_config('profile_custom_fields')) {
if ($user->description) {
echo "<p class='profile-aboutme-title'><b>" . elgg_echo("profile:aboutme") . "</b></p>";
echo "<div class='profile-aboutme-contents'>";
- echo elgg_view('output/longtext', array('value' => $user->description));
+ echo elgg_view('output/longtext', array('value' => $user->description, 'class' => 'mtn'));
echo "</div>";
}
}
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index c93398034..48d7ff24f 100644
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -22,7 +22,7 @@ $admin = elgg_extract('admin', $menu, array());
$profile_actions = '';
if (elgg_is_logged_in() && $actions) {
- $profile_actions = '<ul class="elgg-menu">';
+ $profile_actions = '<ul class="elgg-menu profile-action-menu mvm">';
foreach ($actions as $action) {
$profile_actions .= '<li>' . $action->getContent(array('class' => 'elgg-button elgg-button-action')) . '</li>';
}