natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'multiple-mails' into develop

Browse Source
This commit is contained in:
Patrick Georgi
2011-03-03 14:12:03 +01:00
parent 29d966cdb3 38e6e4f8d3
commit 98f4eac82a
12 changed files with 258 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/IDF/Scm/Git.php
View File

@@ -325,14 +325,12 @@ class IDF_Scm_Git extends IDF_Scm
if (!preg_match('/<(.*)>/', $author, $match)) {
return null;
}
foreach (array('email', 'login') as $what) {
$sql = new Pluf_SQL($what.'=%s', array($match[1]));
$users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));
if ($users->count() > 0) {
return $users[0];
}
$sql = new Pluf_SQL('login=%s', array($match[1]));
$users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));
if ($users->count() > 0) {
return $users[0];
}
return null;
return Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($match[1]);
}
public static function getAnonymousAccessUrl($project, $commit=null)