| Index: branches/REL1_17/extensions/SiteMatrix/SiteMatrix.php |
| — | — | @@ -65,6 +65,7 @@ |
| 66 | 66 | $wgExtensionMessagesFiles['SiteMatrix'] = $dir . 'SiteMatrix.i18n.php'; |
| 67 | 67 | $wgExtensionAliasesFiles['SiteMatrix'] = $dir . 'SiteMatrix.alias.php'; |
| 68 | 68 | |
| | 69 | +$wgAutoloadClasses['SiteMatrix'] = $dir . 'SiteMatrix_body.php'; |
| 69 | 70 | $wgAutoloadClasses['SiteMatrixPage'] = $dir . 'SiteMatrix_body.php'; |
| 70 | 71 | $wgSpecialPages['SiteMatrix'] = 'SiteMatrixPage'; |
| 71 | 72 | $wgSpecialPageGroups['SiteMatrix'] = 'wiki'; |
| Property changes on: branches/REL1_17/extensions/SiteMatrix/SiteMatrix.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 72 | 73 | Merged /branches/wmf/1.17wmf1/extensions/SiteMatrix/SiteMatrix.php:r81761 |
| Index: branches/REL1_17/extensions/CentralAuth/SpecialWikiSets.php |
| — | — | @@ -42,8 +42,8 @@ |
| 43 | 43 | $this->buildMainView(); |
| 44 | 44 | } |
| 45 | 45 | } else { |
| 46 | | - if ( $subpage && !is_numeric( $subpage ) ) { |
| 47 | | - $set = WikiSet::newFromName( $subpage ); |
| | 46 | + if ( $subpage ) { |
| | 47 | + $set = is_numeric( $subpage ) ? WikiSet::newFromId( $subpage ) : WikiSet::newFromName( $subpage ); |
| 48 | 48 | if ( $set ) { |
| 49 | 49 | $subpage = $set->getID(); |
| 50 | 50 | } else { |
| Property changes on: branches/REL1_17/extensions/CentralAuth/SpecialWikiSets.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 51 | 51 | Merged /branches/wmf/1.17wmf1/extensions/CentralAuth/SpecialWikiSets.php:r81956 |
| Index: branches/REL1_17/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -205,8 +205,8 @@ |
| 206 | 206 | $wgRemoveGroups['bureaucrat'][] = 'reviewer'; |
| 207 | 207 | |
| 208 | 208 | # URL location for flaggedrevs.css and flaggedrevs.js |
| 209 | | -# Use a literal $wgScriptPath as a placeholder for the runtime value of $wgScriptPath |
| 210 | | -$wgFlaggedRevsStylePath = '$wgScriptPath/extensions/FlaggedRevs/client'; |
| | 209 | +# Use a literal $wgExtensionAssetsPath as a placeholder for the runtime value of $wgExtensionAssetsPath |
| | 210 | +$wgFlaggedRevsStylePath = '$wgExtensionAssetsPath/FlaggedRevs/client'; |
| 211 | 211 | |
| 212 | 212 | # How far the logs for overseeing quality revisions and depreciations go |
| 213 | 213 | $wgFlaggedRevsOversightAge = 30 * 24 * 3600; |
| — | — | @@ -250,7 +250,7 @@ |
| 251 | 251 | $wgAvailableRights[] = 'stablesettings'; |
| 252 | 252 | |
| 253 | 253 | # Bump this number every time you change flaggedrevs.css/flaggedrevs.js |
| 254 | | -$wgFlaggedRevStyleVersion = 85; |
| | 254 | +$wgFlaggedRevStyleVersion = 87; |
| 255 | 255 | |
| 256 | 256 | $wgExtensionFunctions[] = 'efLoadFlaggedRevs'; |
| 257 | 257 | |
| Index: branches/REL1_17/extensions/FlaggedRevs/FlaggedRevs.class.php |
| — | — | @@ -361,8 +361,8 @@ |
| 362 | 362 | * @return string |
| 363 | 363 | */ |
| 364 | 364 | public static function styleUrlPath() { |
| 365 | | - global $wgFlaggedRevsStylePath, $wgScriptPath; |
| 366 | | - return str_replace( '$wgScriptPath', $wgScriptPath, $wgFlaggedRevsStylePath ); |
| | 365 | + global $wgFlaggedRevsStylePath, $wgExtensionAssetsPath; |
| | 366 | + return str_replace( '$wgExtensionAssetsPath', $wgExtensionAssetsPath, $wgFlaggedRevsStylePath ); |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | # ################ Permission functions ################# |
| Index: branches/REL1_17/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | |
| 147 | 147 | protected function feedTitle() { |
| 148 | 148 | global $wgContLanguageCode, $wgSitename; |
| 149 | | - $page = SpecialPage::getPage( 'problemchanges' ); |
| | 149 | + $page = SpecialPage::getPage( 'ProblemChanges' ); |
| 150 | 150 | $desc = $page->getDescription(); |
| 151 | 151 | return "$wgSitename - $desc [$wgContLanguageCode]"; |
| 152 | 152 | } |
| Property changes on: branches/REL1_17/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 153 | 153 | Merged /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php:r76925 |
| 154 | 154 | Merged /branches/wmf/1.17wmf1/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php:r82224-82225 |
| 155 | 155 | Merged /trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php:r78027,78042,78044,78051,78092,78140,78142,78163,78166,78213,78226,78293,78319,78346,78517,78520,79872-79873,80297 |
| Index: branches/REL1_17/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -145,9 +145,9 @@ |
| 146 | 146 | 'Watchlist', 'Recentchanges', 'Contributions', 'Recentchangeslinked' ); |
| 147 | 147 | foreach ( $spPages as $key ) { |
| 148 | 148 | if ( $title->isSpecial( $key ) ) { |
| 149 | | - global $wgScriptPath, $wgFlaggedRevsStylePath, $wgFlaggedRevStyleVersion; |
| 150 | | - $stylePath = str_replace( '$wgScriptPath', |
| 151 | | - $wgScriptPath, $wgFlaggedRevsStylePath ); |
| | 149 | + global $wgExtensionAssetsPath, $wgFlaggedRevsStylePath, $wgFlaggedRevStyleVersion; |
| | 150 | + $stylePath = str_replace( '$wgExtensionAssetsPath', |
| | 151 | + $wgExtensionAssetsPath, $wgFlaggedRevsStylePath ); |
| 152 | 152 | $encCssFile = htmlspecialchars( "$stylePath/flaggedrevs.css?" . |
| 153 | 153 | $wgFlaggedRevStyleVersion ); |
| 154 | 154 | $out->addExtensionStyle( $encCssFile ); |
| Property changes on: branches/REL1_17/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 155 | 155 | Merged /branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.hooks.php:r82225 |
| Index: branches/REL1_17/extensions/FlaggedRevs/client/flaggedrevs.css |
| — | — | @@ -38,6 +38,10 @@ |
| 39 | 39 | width: 100%; |
| 40 | 40 | clear: both; |
| 41 | 41 | } |
| | 42 | +.rtl table.flaggedrevs_editnotice, |
| | 43 | +.rtl table.flaggedrevs_viewnotice { |
| | 44 | + text-align: right; |
| | 45 | +} |
| 42 | 46 | |
| 43 | 47 | div.flaggedrevs_diffnotice, |
| 44 | 48 | div.flaggedrevs_preview { |
| Property changes on: branches/REL1_17/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 49 | Merged /branches/wmf/1.17wmf1/extensions/FlaggedRevs:r82225 |
| Index: branches/REL1_17/phase3/includes/ChangesList.php |
| — | — | @@ -1121,6 +1121,7 @@ |
| 1122 | 1122 | $this->insertComment( $r, $rcObj ); |
| 1123 | 1123 | $this->insertRollback( $r, $rcObj ); |
| 1124 | 1124 | # Tags |
| | 1125 | + $classes = explode( ' ', $classes ); |
| 1125 | 1126 | $this->insertTags( $r, $rcObj, $classes ); |
| 1126 | 1127 | # Show how many people are watching this if enabled |
| 1127 | 1128 | $r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers); |
| Property changes on: branches/REL1_17/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1128 | 1129 | Merged /branches/wmf/1.17wmf1/includes/ChangesList.php:r81962 |
| Index: branches/REL1_17/phase3/languages/classes/LanguageEo.php |
| — | — | @@ -41,12 +41,12 @@ |
| 42 | 42 | if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) { |
| 43 | 43 | return preg_replace_callback ( |
| 44 | 44 | '/([cghjsu]x?)((?:xx)*)(?!x)/i', |
| 45 | | - 'strrtxuCallback', $string ); |
| | 45 | + array( $this, 'strrtuxCallback' ), $string ); |
| 46 | 46 | } else if ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) { |
| 47 | 47 | # Double Xs only if they follow cxapelutaj literoj. |
| 48 | 48 | return preg_replace_callback( |
| 49 | | - '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/ei', |
| 50 | | - 'strrtuxCallback', $string ); |
| | 49 | + '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/i', |
| | 50 | + array( $this, 'strrtuxCallback' ), $string ); |
| 51 | 51 | } |
| 52 | 52 | return parent::iconv( $in, $out, $string ); |
| 53 | 53 | } |
| Property changes on: branches/REL1_17/phase3/languages/classes/LanguageEo.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 54 | 54 | Merged /branches/REL1_15/phase3/languages/classes/LanguageEo.php:r51646 |
| 55 | 55 | Merged /branches/sqlite/languages/classes/LanguageEo.php:r58211-58321 |
| 56 | 56 | Merged /trunk/phase3/languages/classes/LanguageEo.php:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81657,81833,82845,82847-82849 |
| 57 | 57 | Merged /branches/new-installer/phase3/languages/classes/LanguageEo.php:r43664-66004 |
| 58 | 58 | Merged /branches/wmf/1.17wmf1/languages/classes/LanguageEo.php:r81760,81954 |