From: Qingping Hou <dave2008713@gmail.com>
Date: Mon, 25 Feb 2013 22:16:03 +0000 (-0500)
Subject: Merge branch 'master' of github.com:owncloud/core into issue_1776
X-Git-Tag: v5.0.0RC1~45^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=195b52cb63eda3d8e3af6195058a0e1403e4dede;p=nextcloud-server.git

Merge branch 'master' of github.com:owncloud/core into issue_1776

Conflicts:
	core/templates/layout.user.php
---

195b52cb63eda3d8e3af6195058a0e1403e4dede
diff --cc core/templates/layout.user.php
index 03e55594d67,3bc1903876e..7a677b88345
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@@ -34,7 -34,7 +34,7 @@@
  
  			<ul id="settings" class="svg">
  				<span id="expand">
- 					<span id="expandDisplayName"><?php echo $_['displayname'] ?></span>
 -					<?php echo $_['user_displayname'] ?>
++					<span id="expandDisplayName"><?php echo $_['user_displayname'] ?></span>
  					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
  				</span>
  				<div id="expanddiv">
diff --cc settings/js/personal.js
index 4c8b2542b56,d9455b3786b..d0a471e56b5
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@@ -42,9 -42,6 +42,9 @@@ $(document).ready(function()
  			$.post( 'ajax/changedisplayname.php', post, function(data){
  				if( data.status == "success" ){
  					$('#displaynamechanged').show();
- 					$('#oldDisplayName').val($('#displayName').val());
++					$('#oldDisplayName').text($('#displayName').val());
 +					// update displayName on the top right expand button
- 					$('#expandDisplayName').html($('#displayName').val());
++					$('#expandDisplayName').text($('#displayName').val());
  				}
  				else{
  					$('#newdisplayname').val(data.data.displayName)