| Index: branches/wmf/1.18wmf1/maintenance/deleteBatch.php |
| — | — | @@ -87,8 +87,10 @@ |
| 88 | 88 | if ( $page->getNamespace() == NS_FILE ) { |
| 89 | 89 | $art = new ImagePage( $page ); |
| 90 | 90 | $img = wfFindFile( $art->mTitle ); |
| 91 | | - if ( !$img || !$img->delete( $reason ) ) { |
| 92 | | - $this->output( "FAILED to delete image file... " ); |
| | 91 | + if ( !$img |
| | 92 | + || !$img->isLocal() |
| | 93 | + || !$img->delete( $reason ) ) { |
| | 94 | + $this->output( " FAILED to delete image file... " ); |
| 93 | 95 | } |
| 94 | 96 | } else { |
| 95 | 97 | $art = new Article( $page ); |
| — | — | @@ -96,7 +98,7 @@ |
| 97 | 99 | $success = $art->doDeleteArticle( $reason ); |
| 98 | 100 | $dbw->commit(); |
| 99 | 101 | if ( $success ) { |
| 100 | | - $this->output( "\n" ); |
| | 102 | + $this->output( " Deleted!\n" ); |
| 101 | 103 | } else { |
| 102 | 104 | $this->output( " FAILED to delete article\n" ); |
| 103 | 105 | } |
| Index: branches/wmf/1.18wmf1/skins/Simple.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | $rules[] = "a.stub:after { $underline; }"; |
| 44 | 44 | } |
| 45 | 45 | $style = implode( "\n", $rules ); |
| 46 | | - $out->addInlineStyle( $style, /* flip css if RTL */true ); |
| | 46 | + $out->addInlineStyle( $style, 'flip' ); |
| 47 | 47 | |
| 48 | 48 | } |
| 49 | 49 | } |
| Index: branches/wmf/1.18wmf1/skins/CologneBlue.php |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | $rules[] = "/* @noflip */body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE |
| 46 | 46 | } |
| 47 | 47 | $style = implode( "\n", $rules ); |
| 48 | | - $out->addInlineStyle( $style, /* flip css if RTL */true ); |
| | 48 | + $out->addInlineStyle( $style, 'flip' ); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | } |
| Index: branches/wmf/1.18wmf1/skins/Standard.php |
| — | — | @@ -27,20 +27,20 @@ |
| 28 | 28 | |
| 29 | 29 | if ( 2 == $qb ) { # Right |
| 30 | 30 | $rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; right: 4px; border-left: 2px solid #000000; }"; |
| 31 | | - $rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-left: 4px; margin-right: 152px; }"; |
| | 31 | + $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }"; |
| 32 | 32 | } elseif ( 1 == $qb || 3 == $qb ) { |
| 33 | 33 | $rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; left: 4px; border-right: 1px solid gray; }"; |
| 34 | | - $rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-left: 152px; margin-right: 4px; }"; |
| | 34 | + $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }"; |
| 35 | 35 | if( 3 == $qb ) { |
| 36 | 36 | $rules[] = "/* @noflip */#quickbar { position: fixed; padding: 4px; }"; |
| 37 | 37 | } |
| 38 | 38 | } elseif ( 4 == $qb ) { |
| 39 | 39 | $rules[] = "/* @noflip */#quickbar { position: fixed; right: 0px; top: 0px; padding: 4px;}"; |
| 40 | 40 | $rules[] = "/* @noflip */#quickbar { border-right: 1px solid gray; }"; |
| 41 | | - $rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-right: 152px; margin-left: 4px; }"; |
| | 41 | + $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }"; |
| 42 | 42 | } |
| 43 | 43 | $style = implode( "\n", $rules ); |
| 44 | | - $out->addInlineStyle( $style, /* flip css if RTL */true ); |
| | 44 | + $out->addInlineStyle( $style, 'flip' ); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | } |
| Index: branches/wmf/1.18wmf1/skins/common/shared.css |
| — | — | @@ -732,6 +732,13 @@ |
| 733 | 733 | margin: 0 2em 0 0; |
| 734 | 734 | } |
| 735 | 735 | |
| | 736 | +#toc #toctitle, |
| | 737 | +.toc #toctitle, |
| | 738 | +#toc .toctitle, |
| | 739 | +.toc .toctitle { |
| | 740 | + direction: ltr; |
| | 741 | +} |
| | 742 | + |
| 736 | 743 | /* tooltip styles */ |
| 737 | 744 | .mw-help-field-hint { |
| 738 | 745 | display: none; |
| Index: branches/wmf/1.18wmf1/RELEASE-NOTES-1.18 |
| — | — | @@ -210,6 +210,7 @@ |
| 211 | 211 | them (i.e. with array_keys) to get a list of all preferences, then |
| 212 | 212 | $wgDefaultUserOptions should no longer be used as it will contain those set via |
| 213 | 213 | User:getDefaultOptions(). |
| | 214 | +* (bug 30722) Add a new collation that sorts categories in ascii sort order. |
| 214 | 215 | |
| 215 | 216 | === Bug fixes in 1.18 === |
| 216 | 217 | * mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php) |
| Index: branches/wmf/1.18wmf1/includes/AutoLoader.php |
| — | — | @@ -116,6 +116,7 @@ |
| 117 | 117 | 'HttpRequest' => 'includes/HttpFunctions.old.php', |
| 118 | 118 | 'IContextSource' => 'includes/RequestContext.php', |
| 119 | 119 | 'IcuCollation' => 'includes/Collation.php', |
| | 120 | + 'IdentityCollation' => 'includes/Collation.php', |
| 120 | 121 | 'ImageGallery' => 'includes/ImageGallery.php', |
| 121 | 122 | 'ImageHistoryList' => 'includes/ImagePage.php', |
| 122 | 123 | 'ImageHistoryPseudoPager' => 'includes/ImagePage.php', |
| Property changes on: branches/wmf/1.18wmf1/includes/AutoLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 123 | 124 | Merged /trunk/phase3/includes/AutoLoader.php:r96760,96765,97551-97552,97622 |
| Index: branches/wmf/1.18wmf1/includes/Collation.php |
| — | — | @@ -23,6 +23,8 @@ |
| 24 | 24 | switch( $collationName ) { |
| 25 | 25 | case 'uppercase': |
| 26 | 26 | return new UppercaseCollation; |
| | 27 | + case 'identity': |
| | 28 | + return new IdentityCollation; |
| 27 | 29 | case 'uca-default': |
| 28 | 30 | return new IcuCollation( 'root' ); |
| 29 | 31 | default: |
| — | — | @@ -99,6 +101,30 @@ |
| 100 | 102 | } |
| 101 | 103 | } |
| 102 | 104 | |
| | 105 | +/** |
| | 106 | + * Collation class that's essentially a no-op. |
| | 107 | + * |
| | 108 | + * Does sorting based on binary value of the string. |
| | 109 | + * Like how things were pre 1.17. |
| | 110 | + */ |
| | 111 | +class IdentityCollation extends Collation { |
| | 112 | + |
| | 113 | + function getSortKey( $string ) { |
| | 114 | + return $string; |
| | 115 | + } |
| | 116 | + |
| | 117 | + function getFirstLetter( $string ) { |
| | 118 | + global $wgContLang; |
| | 119 | + // Copied from UppercaseCollation. |
| | 120 | + // I'm kind of unclear on when this could happen... |
| | 121 | + if ( $string[0] == "\0" ) { |
| | 122 | + $string = substr( $string, 1 ); |
| | 123 | + } |
| | 124 | + return $wgContLang->firstChar( $string ); |
| | 125 | + } |
| | 126 | +} |
| | 127 | + |
| | 128 | + |
| 103 | 129 | class IcuCollation extends Collation { |
| 104 | 130 | var $primaryCollator, $mainCollator, $locale; |
| 105 | 131 | var $firstLetterData; |
| Index: branches/wmf/1.18wmf1/includes/DefaultSettings.php |
| — | — | @@ -4798,6 +4798,8 @@ |
| 4799 | 4799 | * |
| 4800 | 4800 | * - uppercase: Converts the category name to upper case, and sorts by that. |
| 4801 | 4801 | * |
| | 4802 | + * - identity: Does no conversion. Sorts by binary value of the string. |
| | 4803 | + * |
| 4802 | 4804 | * - uca-default: Provides access to the Unicode Collation Algorithm with |
| 4803 | 4805 | * the default element table. This is a compromise collation which sorts |
| 4804 | 4806 | * all languages in a mediocre way. However, it is better than "uppercase". |
| — | — | @@ -4811,7 +4813,7 @@ |
| 4812 | 4814 | * the sort keys in the database. |
| 4813 | 4815 | * |
| 4814 | 4816 | * Extensions can define there own collations by subclassing Collation |
| 4815 | | - * and using the class name as the value of this variable. |
| | 4817 | + * and using the Collation::factory hook. |
| 4816 | 4818 | */ |
| 4817 | 4819 | $wgCategoryCollation = 'uppercase'; |
| 4818 | 4820 | |
| Index: branches/wmf/1.18wmf1/includes/OutputPage.php |
| — | — | @@ -2902,10 +2902,10 @@ |
| 2903 | 2903 | /** |
| 2904 | 2904 | * Adds inline CSS styles |
| 2905 | 2905 | * @param $style_css Mixed: inline CSS |
| 2906 | | - * @param $flip Boolean: Whether to flip the CSS if needed |
| | 2906 | + * @param $flip False or String: Set to 'flip' to flip the CSS if needed |
| 2907 | 2907 | */ |
| 2908 | 2908 | public function addInlineStyle( $style_css, $flip = false ) { |
| 2909 | | - if( $flip && $this->getLang()->isRTL() ) { |
| | 2909 | + if( $flip === 'flip' && $this->getLang()->isRTL() ) { |
| 2910 | 2910 | # If wanted, and the interface is right-to-left, flip the CSS |
| 2911 | 2911 | $style_css = CSSJanus::transform( $style_css, true, false ); |
| 2912 | 2912 | } |
| Property changes on: branches/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2913 | 2913 | Merged /trunk/phase3/includes/OutputPage.php:r96760,96765,97551-97552,97622 |