| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_QP_Category.php |
| — | — | @@ -16,7 +16,6 @@ |
| 17 | 17 | */ |
| 18 | 18 | class SMWCategoryResultPrinter extends SMWResultPrinter { |
| 19 | 19 | |
| 20 | | - protected $mSep = ''; |
| 21 | 20 | protected $mDelim = ','; |
| 22 | 21 | protected $mTemplate = ''; |
| 23 | 22 | protected $mUserParam = ''; |
| — | — | @@ -25,9 +24,6 @@ |
| 26 | 25 | protected function readParameters($params,$outputmode) { |
| 27 | 26 | SMWResultPrinter::readParameters($params,$outputmode); |
| 28 | 27 | |
| 29 | | - if (array_key_exists('sep', $params)) { |
| 30 | | - $this->mSep = str_replace('_',' ',$params['sep']); |
| 31 | | - } |
| 32 | 28 | if (array_key_exists('delim', $params)) { |
| 33 | 29 | $this->mDelim = str_replace('_',' ',$params['delim']); |
| 34 | 30 | } |
| — | — | @@ -113,7 +109,7 @@ |
| 114 | 110 | $result .= ' ('; |
| 115 | 111 | $found_values = true; |
| 116 | 112 | } elseif ($found_values || !$first_value) { |
| 117 | | - // any value after '(' or non-first values on first column |
| | 113 | + // any value after '(' or non-first values on first column |
| 118 | 114 | $result .= ', '; |
| 119 | 115 | } |
| 120 | 116 | if ($first_value) { // first value in any column, print header |
| — | — | @@ -145,9 +141,8 @@ |
| 146 | 142 | if ($this->getSearchLabel(SMW_OUTPUT_WIKI)) { |
| 147 | 143 | $link->setCaption($this->getSearchLabel(SMW_OUTPUT_WIKI)); |
| 148 | 144 | } |
| 149 | | - /// NOTE: passing the parameter sep is not needed, since we use format=ul |
| 150 | | - |
| 151 | | - $link->setParameter('ul','format'); // always use ul, other formats hardly work as search page output |
| | 145 | + $link->setParameter('category','format'); |
| | 146 | + if ($this->mNumColumns != 3) $link->setParameter($this->mNumColumns,'columns'); |
| 152 | 147 | if ($this->mTemplate != '') { |
| 153 | 148 | $link->setParameter($this->mTemplate,'template'); |
| 154 | 149 | if (array_key_exists('link', $this->m_params)) { // linking may interfere with templates |