| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php |
| — | — | @@ -75,13 +75,13 @@ |
| 76 | 76 | global $wgRequest, $smwgQMaxInlineLimit; |
| 77 | 77 | |
| 78 | 78 | // First make all inputs into a simple parameter list that can again be parsed into components later. |
| 79 | | - |
| 80 | 79 | if ( $wgRequest->getCheck( 'q' ) ) { // called by own Special, ignore full param string in that case |
| 81 | 80 | $query_values = $wgRequest->getArray( 'p' ); |
| 82 | 81 | $query_val = $wgRequest->getVal( 'p' ); |
| 83 | 82 | |
| 84 | | - if ( ! empty( $query_val ) ) |
| 85 | | - $rawparams = SMWInfolink::decodeParameters( $query_val, false ); // p is used for any additional parameters in certain links |
| | 83 | + if ( !empty( $query_val ) ) |
| | 84 | + // p is used for any additional parameters in certain links. |
| | 85 | + $rawparams = SMWInfolink::decodeParameters( $query_val, false ); |
| 86 | 86 | else { |
| 87 | 87 | $query_values = $wgRequest->getArray( 'p' ); |
| 88 | 88 | |
| — | — | @@ -89,7 +89,8 @@ |
| 90 | 90 | if ( empty( $val ) ) unset( $query_values[$key] ); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | | - $rawparams = SMWInfolink::decodeParameters( $query_values, false ); // p is used for any additional parameters in certain links |
| | 93 | + // p is used for any additional parameters in certain links. |
| | 94 | + $rawparams = SMWInfolink::decodeParameters( $query_values, false ); |
| 94 | 95 | } |
| 95 | 96 | } else { // called from wiki, get all parameters |
| 96 | 97 | $rawparams = SMWInfolink::decodeParameters( $p, true ); |
| — | — | @@ -118,16 +119,12 @@ |
| 119 | 120 | } |
| 120 | 121 | } |
| 121 | 122 | |
| 122 | | - // Now parse parameters and rebuilt the param strings for URLs |
| | 123 | + // Now parse parameters and rebuilt the param strings for URLs. |
| 123 | 124 | SMWQueryProcessor::processFunctionParams( $rawparams, $this->m_querystring, $this->m_params, $this->m_printouts ); |
| 124 | 125 | |
| 125 | | - // Try to complete undefined parameter values from dedicated URL params |
| | 126 | + // Try to complete undefined parameter values from dedicated URL params. |
| 126 | 127 | if ( !array_key_exists( 'format', $this->m_params ) ) { |
| 127 | | - if ( array_key_exists( 'rss', $this->m_params ) ) { // backwards compatibility (SMW<=1.1 used this) |
| 128 | | - $this->m_params['format'] = 'rss'; |
| 129 | | - } else { // default |
| 130 | | - $this->m_params['format'] = 'broadtable'; |
| 131 | | - } |
| | 128 | + $this->m_params['format'] = 'broadtable'; |
| 132 | 129 | } |
| 133 | 130 | |
| 134 | 131 | if ( !array_key_exists( 'order', $this->m_params ) ) { |