Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 999854e515b2
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 935c106f7657
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 2, 2012

  1. Fix #14757: Header text overlaps bottom div border 

    Happened in manage_proj_edit_page.php when there were no subprojects for
the project being edited.

Added an else clause and an empty 'br' div to clear the float so that
the surrounding div flows properly including the h2 element.
    @dregad
    dregad committed Oct 2, 2012

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2856c64 View commit details

  2. Whitespace and coding guidelines fixes

    @dregad
    dregad committed Oct 2, 2012

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    136cb85 View commit details

  3. Fixes #14756: mismatched types passed on to check_selected() 

    When trying to report an issue in a setup having subprojects, and no
specific project is selected (current project = 'All projects'), an
error is triggered in check_selected() due to mismatched types.

Statically casting the project_id as string to solve the problem.

Thanks to phyllisl for detecting and proposing a solution to this issue.
    @dregad
    dregad committed Oct 2, 2012

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    935c106 View commit details
Showing with 24 additions and 21 deletions.
  1. +18 −20 core/print_api.php
  2. +6 −1 manage_proj_edit_page.php
38 changes: 18 additions & 20 deletions core/print_api.php
View file
Original file line number Diff line number Diff line change
@@ -471,7 +471,7 @@ function print_note_option_list( $p_user_id = '', $p_project_id = null, $p_thres
if ( null === $p_threshold ) {
$p_threshold = config_get( 'add_bugnote_threshold' );
}

print_user_option_list( $p_user_id, $p_project_id, $p_threshold );
}

@@ -525,7 +525,7 @@ function print_subproject_option_list( $p_parent_id, $p_project_id = null, $p_fi
}
echo $t_full_id . '"';
if ( $p_project_id !== null ) {
check_selected( $p_project_id, $t_full_id );
check_selected( (string)$p_project_id, $t_full_id );
}
echo '>' . str_repeat( '&#160;', count( $p_parents ) ) . str_repeat( '&#187;', count( $p_parents ) ) . ' ' . string_attribute( project_get_field( $t_id, 'name' ) ) . '</option>' . "\n";
print_subproject_option_list( $t_id, $p_project_id, $p_filter_project_id, $p_trace, $p_parents );
@@ -1177,8 +1177,8 @@ function print_bracket_link_prepared( $p_link ) {
function print_bracket_link( $p_link, $p_url_text, $p_new_window = false, $p_class = '' ) {
echo '<span class="bracket-link';
if ($p_class !== '') {
echo ' bracket-link-',$p_class; # prefix on a container allows styling of whole link, including brackets
}
echo ' bracket-link-',$p_class; # prefix on a container allows styling of whole link, including brackets
}
echo '">[&#160;';
print_link( $p_link, $p_url_text, $p_new_window, $p_class );
echo '&#160;]</span> ';
@@ -1372,8 +1372,8 @@ function print_documentation_link( $p_a_name = '' ) {
# prints the signup link
function print_signup_link() {
if ( ( ON == config_get_global( 'allow_signup' ) ) &&
( LDAP != config_get_global( 'login_method' ) ) &&
( ON == config_get( 'enable_email_notification' ) )
( LDAP != config_get_global( 'login_method' ) ) &&
( ON == config_get( 'enable_email_notification' ) )
) {
print_bracket_link( 'signup_page.php', lang_get( 'signup_link' ) );
}
@@ -1388,9 +1388,9 @@ function print_login_link() {
function print_lost_password_link() {
# lost password feature disabled or reset password via email disabled -> stop here!
if ( ( LDAP != config_get_global( 'login_method' ) ) &&
( ON == config_get( 'lost_password_feature' ) ) &&
( ON == config_get( 'send_reset_password' ) ) &&
( ON == config_get( 'enable_email_notification' ) ) ) {
( ON == config_get( 'lost_password_feature' ) ) &&
( ON == config_get( 'send_reset_password' ) ) &&
( ON == config_get( 'enable_email_notification' ) ) ) {
print_bracket_link( 'lost_pwd_page.php', lang_get( 'lost_password_link' ) );
}
}
@@ -1634,12 +1634,11 @@ function print_timezone_option_list( $p_timezone ) {

$t_identifiers = timezone_identifiers_list();

foreach ( $t_identifiers as $t_identifier )
{
$t_zone = explode( '/', $t_identifier );
foreach ( $t_identifiers as $t_identifier ) {
$t_zone = explode( '/', $t_identifier );

// Only use "friendly" continent names - http://us.php.net/manual/en/timezones.others.php
if ($t_zone[0] == 'Africa' ||
// Only use "friendly" continent names - http://us.php.net/manual/en/timezones.others.php
if( $t_zone[0] == 'Africa' ||
$t_zone[0] == 'America' ||
$t_zone[0] == 'Antarctica' ||
$t_zone[0] == 'Arctic' ||
@@ -1648,12 +1647,11 @@ function print_timezone_option_list( $p_timezone ) {
$t_zone[0] == 'Australia' ||
$t_zone[0] == 'Europe' ||
$t_zone[0] == 'Indian' ||
$t_zone[0] == 'Pacific' )
{
if ( isset( $t_zone[1] ) != '' )
{
$t_locations[$t_zone[0]][$t_zone[0] . '/' . $t_zone[1]] = array( str_replace( '_', ' ', $t_zone[1] ), $t_identifier );
}
$t_zone[0] == 'Pacific'
) {
if( isset( $t_zone[1] ) != '' ) {
$t_locations[$t_zone[0]][$t_zone[0] . '/' . $t_zone[1]] = array( str_replace( '_', ' ', $t_zone[1] ), $t_identifier );
}
}
}

7 changes: 6 additions & 1 deletion manage_proj_edit_page.php
View file
Original file line number Diff line number Diff line change
@@ -261,7 +261,12 @@
<span class="submit-button"><input type="submit" value="<?php echo lang_get( 'update_subproject_inheritance' ) ?>" /></span>
</fieldset>
</form><?php
} # End of hiding subproject listing if there are no subprojects ?>
# End of subprojects listing / update form
} else {
# If there are no subprojects, clear floats to h2 overlap on div border
?>
<div class="br"></div>
<?php } ?>

</div>