| Index: branches/wmf/1.18wmf1/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | }, |
| 459 | 459 | 'offset': { |
| 460 | 460 | 'default': [-70, -142], |
| 461 | | - 'default-rtl': [-70, -502], |
| | 461 | + 'default-rtl': [-70, -502] |
| 462 | 462 | }, |
| 463 | 463 | 'action': { |
| 464 | 464 | 'type': 'encapsulate', |
| Index: branches/wmf/1.18wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js |
| — | — | @@ -21,6 +21,8 @@ |
| 22 | 22 | && mw.util.getParamValue( 'redirect' ) != 'no' |
| 23 | 23 | // Not viewing the printable version |
| 24 | 24 | && mw.util.getParamValue( 'printable' ) != 'yes' |
| | 25 | + // Not using CologneBlue skin (see bug 31410) |
| | 26 | + && mw.config.get( 'skin' ) != 'cologneblue' |
| 25 | 27 | ) { |
| 26 | 28 | // Assign a tracking bucket using options from wgArticleFeedbackTracking |
| 27 | 29 | mw.user.bucket( |