Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3501189

Browse files
dregaddregad
committedNov 16, 2012
Merge tag 'release-1.2.12' into oracle
Conflicts: core/file_api.php
2 parents e7625d7 + 9c78ca8 commit 3501189

File tree

186 files changed

+4604
-2983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+4604
-2983
lines changed
 

‎.mailmap

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Adrian Spinei <aspinei@users.sourceforge.net> aspinei
2+
André Eisenbach <int2str@users.sourceforge.net> int2str
3+
Bastian Pfenningschmidt <bpfennigschmidt@users.sourceforge.net> bpfennigschmidt
4+
Damien Regad <dr_mantis@regad.org> <damien.regad@merckgroup.com>
5+
Damien Regad <dr_mantis@regad.org> <damien.regad@merckserono.net>
6+
David Hicks <d@hx.id.au> <hickseydr@optusnet.com.au>
7+
David Newcomb <davidnewcomb@users.sourceforge.net> davidnewcomb
8+
Frank Rodgers <frodgers@redcom.com> <frodgers@iowa.redcom.com>
9+
Jim Hanley <dgtlrift@users.sourceforge.net> dgtlrift
10+
Johan Guilbaud <git@lapinkiller.fr>
11+
Johan Guilbaud <git@lapinkiller.fr> Lapinkiller <lapinkiller@hotmail.fr>
12+
John Reese <john@noswap.com> <jreese@leetcode.net>
13+
Kornel Lesinski <kornel@aardvarkmedia.co.uk>
14+
Lincoln Maskey <narcissus@users.sourceforge.net> narcissus
15+
Marcello Scata <marcelloscata@users.sourceforge.net> masc
16+
Michael Lorer <info@01-scripts.de>
17+
Paul Richards <paul@mantisforge.org> Paul
18+
Paul Richards <paul@mantisforge.org> <Paul@.(none)>
19+
Paul Richards <paul@mantisforge.org> root <root@paul.shroudbox.com>
20+
Robert Munteanu <robert@lmn.ro> <robert.munteanu@gmail.com>
21+
Robert Munteanu <robert@lmn.ro> <robert.munteanu@sdc.ro>
22+
Siebrand Mazeland <s.mazeland@xs4all.nl>
23+
Siebrand Mazeland <s.mazeland@xs4all.nl> git <Administrator@.(none)>
24+
Siebrand Mazeland <s.mazeland@xs4all.nl> unknown <Administrator@.(none)>
25+
Stéphane Veyret <sveyret@axway.com>
26+
Tarik Sedlarevic <tazza70@users.sourceforge.net> tazza70
27+
Véronique Maginot <veronique.maginot@credit-agricole-sa.fr>
28+
Victor Boctor <vboctor@gmail.com> root <root@localhost.localdomain>
29+
Victor Boctor <vboctor@gmail.com> <vboctor@new-host-3.home>

‎account_prefs_inc.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,16 @@ function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_
7575
</td>
7676
<td width="50%">
7777
<select name="default_project">
78-
<?php print_project_option_list( $t_pref->default_project ) ?>
78+
<?php
79+
# Count number of available projects
80+
$t_projects = current_user_get_accessible_projects();
81+
$t_num_proj = count( $t_projects );
82+
if( $t_num_proj == 1 ) {
83+
$t_num_proj += count( current_user_get_accessible_subprojects( $t_projects[0] ) );
84+
}
85+
# Only display "All projects" in selection list if there is more than 1
86+
print_project_option_list( $t_pref->default_project, $t_num_proj > 1 );
87+
?>
7988
</select>
8089
</td>
8190
</tr>

0 commit comments

Comments
 (0)