[Pkg-owncloud-commits] [owncloud] 268/394: Merge pull request #956 from RandolfCarter/DefaultEmailAddressStable45

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit afa8f68fe08c3ba27fd3859341cd9a7b93f69eb4
Merge: 469cf60 b9199b8
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Sun Jan 6 13:42:03 2013 -0800

    Merge pull request #956 from RandolfCarter/DefaultEmailAddressStable45
    
    stable45 fixing default email sender address

 core/ajax/share.php         |    8 +-------
 core/lostpassword/index.php |    2 +-
 lib/public/util.php         |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --cc core/lostpassword/index.php
index 989f5cb,e2f520b..50836a2
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@@ -22,8 -22,9 +22,8 @@@ if (isset($_POST['user'])) 
  			$tmpl->assign('link', $link, false);
  			$msg = $tmpl->fetchPage();
  			$l = OC_L10N::get('core');
- 			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
+ 			$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
  			OC_MAIL::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
 -			echo('sent');
  		}
  		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true));
  	} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git