| Index: branches/REL1_18/extensions/LiquidThreads/LiquidThreads.php |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | $wgResourceModules['ext.liquidThreads'] = $lqtResourceTemplate + array( |
| 73 | 73 | 'styles' => array( 'lqt.css', 'jquery/jquery.thread_collapse.css', 'lqt.dialogs.css' ), |
| 74 | 74 | 'scripts' => array( 'lqt.js', 'js/lqt.toolbar.js', 'jquery/jquery.thread_collapse.js', 'jquery/jquery.autogrow.js' ), |
| 75 | | - 'dependencies' => array( 'jquery.ui.dialog' ), |
| | 75 | + 'dependencies' => array( 'jquery.ui.dialog', 'jquery.ui.droppable' ), |
| 76 | 76 | 'messages' => $lqtMessages |
| 77 | 77 | ); |
| 78 | 78 | |
| Index: branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php |
| — | — | @@ -199,7 +199,7 @@ |
| 200 | 200 | $threadInfo .= "\t" . Xml::element( $key, null, $value ) . "\n"; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | | - $out .= Xml::tags( 'DiscussionThreading', null, $threadInfo ) . "\n"; |
| | 203 | + $out .= UtfNormal::cleanUp( Xml::tags( 'DiscussionThreading', null, $threadInfo ) . "\n" ); |
| 204 | 204 | |
| 205 | 205 | return true; |
| 206 | 206 | } |
| Property changes on: branches/REL1_18/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 207 | 207 | Merged /trunk/extensions/LiquidThreads:r89121,89266,90723,90857,91578,92300 |
| Index: branches/REL1_18/extensions/GlobalBlocking/GlobalBlocking.class.php |
| — | — | @@ -44,7 +44,7 @@ |
| 45 | 45 | return $result = array(); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | | - if ( $user->isAllowed( 'ipblock-exempt', 'globalblock-exempt' ) ) { |
| | 48 | + if ( $user->isAllowed( 'ipblock-exempt' ) || $user->isAllowed( 'globalblock-exempt' ) ) { |
| 49 | 49 | // User is exempt from IP blocks. |
| 50 | 50 | return $result = array(); |
| 51 | 51 | } |
| Index: branches/REL1_18/extensions/CentralAuth/specials/SpecialCentralAuth.php |
| — | — | @@ -363,6 +363,12 @@ |
| 364 | 364 | |
| 365 | 365 | function listMergedWikiItem( $row ) { |
| 366 | 366 | global $wgLang; |
| | 367 | + if ( $row === null ) { |
| | 368 | + // https://bugzilla.wikimedia.org/show_bug.cgi?id=28767 |
| | 369 | + // It seems sometimes local accounts aren't correctly created |
| | 370 | + // Revisiting the wiki solves the issue |
| | 371 | + return ''; |
| | 372 | + } |
| 367 | 373 | return '<tr>' . |
| 368 | 374 | ( $this->mCanUnmerge ? '<td>' . $this->adminCheck( $row['wiki'] ) . '</td>' : '' ) . |
| 369 | 375 | '<td>' . $this->foreignUserLink( $row['wiki'] ) . '</td>' . |
| Index: branches/REL1_18/extensions/Cite/citeParserTests.txt |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | </p> |
| 114 | 114 | <ul class="gallery"> |
| 115 | 115 | <li class="gallerybox" style="width: 155px"><div style="width: 155px"> |
| 116 | | - <div class="thumb" style="width: 150px;"><div style="margin:66px auto;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="120" height="14" /></a></div></div> |
| | 116 | + <div class="thumb" style="width: 150px;"><div style="margin:68px auto;"><a href="https://www.mediawiki.org/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg" src="http://example.com/images/3/3a/Foobar.jpg" width="120" height="14" /></a></div></div> |
| 117 | 117 | <div class="gallerytext"> |
| 118 | 118 | </div> |
| 119 | 119 | </div></li> |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 120 | 120 | Merged /trunk/extensions:r89121,89266,90723,90857,91578,92300 |