| Index: trunk/extensions/CategoryBrowser/CategoryBrowserView.php |
| — | — | @@ -146,7 +146,8 @@ |
| 147 | 147 | $result = ''; |
| 148 | 148 | if ( !empty( $pager_row->cl_sortkey ) && |
| 149 | 149 | $title_obj->getText() != $pager_row->cl_sortkey ) { |
| 150 | | - $this->sortkey_hint = '(' . CategoryViewer::getSubcategorySortChar( $title_obj, $pager_row->cl_sortkey ) . ')'; |
| | 150 | + $cv = new CategoryViewer( $title_obj ); |
| | 151 | + $this->sortkey_hint = '(' . $cv->getSubcategorySortChar( $title_obj, $pager_row->cl_sortkey ) . ')'; |
| 151 | 152 | $result = CB_XML::toText( $this->sortkey_hint_tpl ); |
| 152 | 153 | } |
| 153 | 154 | return $result; |
| Index: trunk/extensions/CategoryBrowser/CategoryBrowser.php |
| — | — | @@ -90,7 +90,9 @@ |
| 91 | 91 | global $wgAjaxExportList; |
| 92 | 92 | |
| 93 | 93 | self::$ExtDir = str_replace( "\\", "/", dirname( __FILE__ ) ); |
| 94 | | - $top_dir = array_pop( explode( '/', self::$ExtDir ) ); |
| | 94 | + // next expression splitted into two separate lines due to warning in E_STRICT mode |
| | 95 | + $top_dir = explode( '/', self::$ExtDir ); |
| | 96 | + $top_dir = array_pop( $top_dir ); |
| 95 | 97 | self::$ScriptPath = $wgScriptPath . '/extensions' . ( ( $top_dir == 'extensions' ) ? '' : '/' . $top_dir ); |
| 96 | 98 | $wgExtensionMessagesFiles['CategoryBrowser'] = self::$ExtDir . '/CategoryBrowser.i18n.php'; |
| 97 | 99 | |
| — | — | @@ -165,11 +167,11 @@ |
| 166 | 168 | } |
| 167 | 169 | } |
| 168 | 170 | |
| 169 | | - static function entities( &$s ) { |
| | 171 | + static function entities( $s ) { |
| 170 | 172 | return htmlentities( $s, ENT_COMPAT, 'UTF-8' ); |
| 171 | 173 | } |
| 172 | 174 | |
| 173 | | - static function specialchars( &$s ) { |
| | 175 | + static function specialchars( $s ) { |
| 174 | 176 | return htmlspecialchars( $s, ENT_COMPAT, 'UTF-8' ); |
| 175 | 177 | } |
| 176 | 178 | |