Index: trunk/extensions/SemanticDrilldown/specials/SD_BrowseData.php |
— | — | @@ -343,10 +343,11 @@ |
344 | 344 | $sql .= "JOIN $smw_atts a$i ON ids.smw_id = a$i.s_id "; |
345 | 345 | } |
346 | 346 | } |
347 | | - if ( $subcategory ) |
| 347 | + if ( $subcategory ) { |
348 | 348 | $actual_cat = str_replace( ' ', '_', $subcategory ); |
349 | | - else |
| 349 | + } else { |
350 | 350 | $actual_cat = str_replace( ' ', '_', $category ); |
| 351 | + } |
351 | 352 | $actual_cat = str_replace( "'", "\'", $actual_cat ); |
352 | 353 | $sql .= "WHERE insts.o_id IN |
353 | 354 | (SELECT smw_id FROM $smw_ids cat_ids |
— | — | @@ -749,8 +750,9 @@ |
750 | 751 | $found_results_for_filter = false; |
751 | 752 | if ( count( $f->allowed_values ) == 0 ) { |
752 | 753 | $filter_values = $f->getAllValues(); |
753 | | - if ( count( $filter_values ) > 0 ) |
| 754 | + if ( count( $filter_values ) > 0 ) { |
754 | 755 | $found_results_for_filter = true; |
| 756 | + } |
755 | 757 | } else { |
756 | 758 | $filter_values = array(); |
757 | 759 | foreach ( $f->allowed_values as $value ) { |
— | — | @@ -798,8 +800,9 @@ |
799 | 801 | } elseif ( $f->input_type == wfMsgForContent( 'sd_filter_daterange' ) ) { |
800 | 802 | $results_line = $this->printDateRangeInput( $filter_name ); |
801 | 803 | $normal_filter = false; |
802 | | - } else |
| 804 | + } else { |
803 | 805 | $results_line = $this->printUnappliedFilterValues( $cur_url, $f, $filter_values ); |
| 806 | + } |
804 | 807 | |
805 | 808 | $text = ""; |
806 | 809 | $filter_label = $this->printFilterLabel( $f->name ); |