Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master-2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
vboctor committed Feb 20, 2017
2 parents 693bde7 + dbeac73 commit 17366ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bugnote_add.php
Expand Up @@ -95,7 +95,7 @@
$t_file_infos = array();
}

if( is_blank( $f_bugnote_text ) ) {
if( is_blank( $f_bugnote_text ) && helper_duration_to_minutes( $f_time_tracking ) == 0 ) {
if( $f_files === null ) {
error_parameters( lang_get( 'bugnote' ) );
trigger_error( ERROR_EMPTY_FIELD, ERROR );
Expand Down
4 changes: 4 additions & 0 deletions core/columns_api.php
Expand Up @@ -322,6 +322,10 @@ function column_is_sortable( $p_column ) {
case 'attachment_count':
case 'tags':
case 'overdue':
case 'additional_information':
case 'description':
case 'notes':
case 'steps_to_reproduce':
return false;
}

Expand Down
4 changes: 3 additions & 1 deletion core/filter_api.php
Expand Up @@ -2976,14 +2976,16 @@ function filter_name_valid_length( $p_name ) {
}

/**
* Create a filter for getting issues modified in the last N days
* Create a filter for getting issues modified in the last N days.
* @param integer $p_days Number of days counting from today
* @param array $p_filter Add the filter conditions over this filter array. Return a new one if null
* @return array Filter array
*/
function filter_create_recently_modified( $p_days, $p_filter = null ) {
if( null === $p_filter ) {
$p_filter = filter_get_default();
# This filter overrides default "hide status" property
$p_filter[FILTER_PROPERTY_HIDE_STATUS] = META_FILTER_NONE;
}
$c_days = (int)$p_days;
$p_filter[FILTER_PROPERTY_FILTER_BY_LAST_UPDATED_DATE] = true;
Expand Down
2 changes: 1 addition & 1 deletion core/layout_api.php
Expand Up @@ -419,7 +419,7 @@ function layout_navbar() {
echo '<div class="navbar-header">';
echo '<a href="' . $t_logo_url . '" class="navbar-brand">';
echo '<span class="smaller-75"> ';
echo config_get('window_title');
echo string_display_line( config_get('window_title') );
echo ' </span>';
echo '</a>';

Expand Down

0 comments on commit 17366ae

Please sign in to comment.