| Index: branches/REL1_17/extensions/Deployment/specials/SpecialInstall.php |
| — | — | @@ -138,11 +138,11 @@ |
| 139 | 139 | "<option value='tag'$tagSelected>" . htmlspecialchars( wfMsg( 'search-tag' ) ) . '</option>' |
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | | - $searchHtml .= ' '; |
| | 142 | + $searchHtml .= '  '; |
| 143 | 143 | |
| 144 | 144 | $searchHtml .= Html::input( 'filtervalue', $value ); |
| 145 | 145 | |
| 146 | | - $searchHtml .= ' '; |
| | 146 | + $searchHtml .= '  '; |
| 147 | 147 | |
| 148 | 148 | $searchHtml .= Html::input( |
| 149 | 149 | '', |
| Index: branches/REL1_17/extensions/CodeReview/backend/Subversion.php |
| — | — | @@ -161,7 +161,7 @@ |
| 162 | 162 | $formats = array( |
| 163 | 163 | 'rev' => '/^r(\d+)$/', |
| 164 | 164 | 'author' => '/^(.*)$/', |
| 165 | | - 'date' => '/^(.*?) \(.*\)$/', |
| | 165 | + 'date' => '/^(?:(.*?) )?\(.*\)$/', // account for '(no date)' |
| 166 | 166 | 'lines' => '/^(\d+) lines?$/', |
| 167 | 167 | ); |
| 168 | 168 | $state = "start"; |
| Index: branches/REL1_17/extensions/RDFIO/specials/SpecialSPARQLEndpoint_body.php |
| — | — | @@ -897,9 +897,9 @@ |
| 898 | 898 | <input type="text" name="filtervocaburl" size="48" /> |
| 899 | 899 | </td></tr> |
| 900 | 900 | <tr> |
| 901 | | - <td> </td> |
| 902 | | - <td> </td> |
| 903 | | - <td> </td> |
| | 901 | + <td> </td> |
| | 902 | + <td> </td> |
| | 903 | + <td> </td> |
| 904 | 904 | <td> |
| 905 | 905 | <span style="font-family: arial, helvetica, sans-serif; font-size: 10px; color: #777">Example: http://xmlns.com/foaf/spec/index.rdf</span> |
| 906 | 906 | </td></tr> |
| Index: branches/REL1_17/extensions/ProofreadPage/ProofreadPage_body.php |
| — | — | @@ -1529,7 +1529,7 @@ |
| 1530 | 1530 | $qe = $ne * 100 / $n; |
| 1531 | 1531 | $void_cell = $ne ? "<td align=center style='border-style:dotted;border-width:1px;' width=\"{$qe}\"></td>" : ''; |
| 1532 | 1532 | $output = "<table class=\"pr_quality\" style=\"line-height:40%;\" border=0 cellpadding=0 cellspacing=0 ><tr> |
| 1533 | | -<td align=center > </td> |
| | 1533 | +<td align=center > </td> |
| 1534 | 1534 | <td align=center class='quality4' width=\"$q4\"></td> |
| 1535 | 1535 | <td align=center class='quality3' width=\"$q3\"></td> |
| 1536 | 1536 | <td align=center class='quality2' width=\"$q2\"></td> |
| Index: branches/REL1_17/extensions/DSMW/DSMW.php |
| — | — | @@ -103,15 +103,15 @@ |
| 104 | 104 | |
| 105 | 105 | $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'other'][] = array( |
| 106 | 106 | 'path' => __FILE__, |
| 107 | | - 'name' => 'Distributed Semantic MediaWiki', |
| | 107 | + 'name' => 'Distributed Semantic MediaWiki', |
| 108 | 108 | 'version' => DSMW_VERSION, |
| 109 | 109 | 'author' => array( |
| 110 | | - '[http://www.loria.fr/~mullejea Jean–Philippe Muller]', |
| 111 | | - '[http://www.loria.fr/~molli Pascal Molli]', |
| 112 | | - '[http://www.loria.fr/~skaf Hala Skaf–Molli]', |
| 113 | | - '[http://www.loria.fr/~canals Gérôme Canals]', |
| 114 | | - '[http://www.loria.fr/~rahalcha Charbel Rahal]', |
| 115 | | - '[http://www.loria.fr/~weiss Stéphane Weiss]', |
| | 110 | + '[http://www.loria.fr/~mullejea Jean–Philippe Muller]', |
| | 111 | + '[http://www.loria.fr/~molli Pascal Molli]', |
| | 112 | + '[http://www.loria.fr/~skaf Hala Skaf–Molli]', |
| | 113 | + '[http://www.loria.fr/~canals Gérôme Canals]', |
| | 114 | + '[http://www.loria.fr/~rahalcha Charbel Rahal]', |
| | 115 | + '[http://www.loria.fr/~weiss Stéphane Weiss]', |
| 116 | 116 | '[http://m3p.gforge.inria.fr/pmwiki/pmwiki.php?n=Site.Team others]' |
| 117 | 117 | ), |
| 118 | 118 | 'url' => 'http://www.dsmw.org', |
| Index: branches/REL1_17/extensions/DSMW/tests/p2pTest3.php |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | | valign='top' | <span style='color: red;'><em><del>line deleted</del></em></span> |
| 156 | 156 | | valign='top' | <span style='c/home/mullejea/Bureau/www/mediawiki-1.14.0/extensions/DSMW/tests/p2pTest3.php:258olor: red;'><em><del>line deleted</del></em></span> |
| 157 | 157 | | valign='top' | <span style='color: red;'><em><del>line deleted</del></em></span> |
| 158 | | -| valign='top' | <ul><li>DSMW server1 and server2 delete the “initial_line” |
| | 158 | +| valign='top' | <ul><li>DSMW server1 and server2 delete the “initial_line” |
| 159 | 159 | </li></ul> |
| 160 | 160 | |} |
| 161 | 161 | |
| Index: branches/REL1_17/extensions/DSMW/files/utils.php |
| — | — | @@ -844,7 +844,7 @@ |
| 845 | 845 | foreach ( $props as $property ) { |
| 846 | 846 | |
| 847 | 847 | if ( $property->isUserDefined() ) { // user defined property |
| 848 | | - $property->setCaption( preg_replace( '/[ ]/u', ' ', $property->getWikiValue(), 2 ) ); |
| | 848 | + $property->setCaption( preg_replace( '/[ ]/u', ' ', $property->getWikiValue(), 2 ) ); |
| 849 | 849 | |
| 850 | 850 | if ( $property->getWikiPageValue() != null ) { |
| 851 | 851 | $obj = $property->getWikiPageValue(); |
| Index: branches/REL1_17/extensions/DSMW/specials/ArticleAdminPage.php |
| — | — | @@ -309,11 +309,11 @@ |
| 310 | 310 | </table> |
| 311 | 311 | </FORM> |
| 312 | 312 | <div id="pullstatus" style="display: none; width: 100%; clear: both;" > |
| 313 | | -<a name="PULL_Progress_:" id="PULL_Progress_:"></a><h2> <span class="mw-headline"> PULL Progress : </span></h2> |
| | 313 | +<a name="PULL_Progress_:" id="PULL_Progress_:"></a><h2> <span class="mw-headline"> PULL Progress : </span></h2> |
| 314 | 314 | <div id="statepull" ></div><br /> |
| 315 | 315 | </div> |
| 316 | 316 | <div id="pushstatus" style="display: none; width: 100%; clear: both;" > |
| 317 | | -<a name="PUSH_Progress_:" id="PUSH_Progress_:"></a><h2> <span class="mw-headline"> PUSH Progress : </span></h2> |
| | 317 | +<a name="PUSH_Progress_:" id="PUSH_Progress_:"></a><h2> <span class="mw-headline"> PUSH Progress : </span></h2> |
| 318 | 318 | <div id="statepush" ></div><br /> |
| 319 | 319 | </div> |
| 320 | 320 | '; |
| Index: branches/REL1_17/extensions/LdapAuthentication/LdapAutoAuthentication.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | global $wgAuth; |
| 114 | 114 | $wgAuth->printDebug( "Entering NoLogout.", NONSENSITIVE ); |
| 115 | 115 | |
| 116 | | - $personal_urls['logout'] = null; |
| | 116 | + unset( $personal_urls['logout'] ); |
| 117 | 117 | |
| 118 | 118 | return true; |
| 119 | 119 | } |
| Index: branches/REL1_17/extensions/LdapAuthentication/LdapAuthentication.php |
| — | — | @@ -88,7 +88,7 @@ |
| 89 | 89 | $wgLDAPUniqueBlockLogin = array(); //Currently unused |
| 90 | 90 | $wgLDAPUniqueRenameUser = array(); //Currently unused |
| 91 | 91 | |
| 92 | | -define( "LDAPAUTHVERSION", "1.2d" ); |
| | 92 | +define( "LDAPAUTHVERSION", "1.2e" ); |
| 93 | 93 | |
| 94 | 94 | /** |
| 95 | 95 | * Add extension information to Special:Version |
| Index: branches/REL1_17/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php |
| — | — | @@ -250,9 +250,9 @@ |
| 251 | 251 | $form .= '<td>' . |
| 252 | 252 | '<p style="border: 1px solid rgb(187, 187, 187); float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'. |
| 253 | 253 | Xml::radio( 'card', 'cc1', $this->form_data['card'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' . |
| 254 | | - ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' . |
| 255 | | - ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' . |
| 256 | | - ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' . |
| | 254 | + ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-mastercard.png" ) ). '</label>' . |
| | 255 | + ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-amex.png" ) ). '</label>' . |
| | 256 | + ' <label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-discover.png" ) ). '</label>' . |
| 257 | 257 | '</p>'. |
| 258 | 258 | '<p style="border: 1px solid transparent; float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0; padding: 5px 5px 5px 3px; white-space: nowrap;">'. |
| 259 | 259 | Xml::radio( 'card', 'pp', $this->form_data['card'] == 'pp', array( 'id' => 'ppradio', 'onclick' => 'switchToPayPal()' ) ) . '<label for="ppradio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-paypal.png" ) ) . '</label>' . |
| Index: branches/REL1_17/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $form .= Html::hidden( 'PaypalRedirect', 0 ); |
| 120 | 120 | $form .= Xml::tags( 'div', |
| 121 | 121 | array(), |
| 122 | | - Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . ' <a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| | 122 | + Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos2.gif" ) ) . '   <a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/donate_with_paypal.gif"/></a>' |
| 123 | 123 | ); |
| 124 | 124 | $form .= '</td>'; |
| 125 | 125 | $form .= '</tr>'; |
| Index: branches/REL1_17/extensions/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnLetter3.php |
| — | — | @@ -168,7 +168,7 @@ |
| 169 | 169 | // submit button |
| 170 | 170 | $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) ); |
| 171 | 171 | // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' )); |
| 172 | | - $form .= ' <br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) ); |
| | 172 | + $form .= ' <br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) ); |
| 173 | 173 | $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button |
| 174 | 174 | $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) . |
| 175 | 175 | Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-right:4px;' ) ) . 'Your credit / debit card will be securely processed.'; |
| Index: branches/REL1_17/extensions/DonationInterface/payflowpro_gateway/forms/OneStepTwoColumn.php |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | // card logos |
| 282 | 282 | $form .= '<tr>'; |
| 283 | 283 | $form .= '<td />'; |
| 284 | | - $form .= '<td> <br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>'; |
| | 284 | + $form .= '<td> <br/>' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/credit_card_logos.gif" ) ) . '</td>'; |
| 285 | 285 | $form .= '</tr>'; |
| 286 | 286 | |
| 287 | 287 | // card number |
| Index: branches/REL1_17/extensions/QrCode/phpqrcode/qrspec.php |
| — | — | @@ -490,7 +490,7 @@ |
| 491 | 491 | if ($binary_mode) { |
| 492 | 492 | |
| 493 | 493 | foreach ($frame as &$frameLine) { |
| 494 | | - $frameLine = join('<span class="m"> </span>', explode('0', $frameLine)); |
| | 494 | + $frameLine = join('<span class="m">  </span>', explode('0', $frameLine)); |
| 495 | 495 | $frameLine = join('██', explode('1', $frameLine)); |
| 496 | 496 | } |
| 497 | 497 | |
| — | — | @@ -499,23 +499,23 @@ |
| 500 | 500 | .m { background-color: white; } |
| 501 | 501 | </style> |
| 502 | 502 | <?php |
| 503 | | - echo '<pre><tt><br/ ><br/ ><br/ > '; |
| 504 | | - echo join("<br/ > ", $frame); |
| | 503 | + echo '<pre><tt><br/ ><br/ ><br/ >        '; |
| | 504 | + echo join("<br/ >        ", $frame); |
| 505 | 505 | echo '</tt></pre><br/ ><br/ ><br/ ><br/ ><br/ ><br/ >'; |
| 506 | 506 | |
| 507 | 507 | } else { |
| 508 | 508 | |
| 509 | 509 | foreach ($frame as &$frameLine) { |
| 510 | | - $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
| | 510 | + $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
| 511 | 511 | $frameLine = join('<span class="m">▒</span>', explode("\xc1", $frameLine)); |
| 512 | | - $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
| | 512 | + $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
| 513 | 513 | $frameLine = join('<span class="p">▒</span>', explode("\xa1", $frameLine)); |
| 514 | 514 | $frameLine = join('<span class="s">◇</span>', explode("\x84", $frameLine)); //format 0 |
| 515 | 515 | $frameLine = join('<span class="s">◆</span>', explode("\x85", $frameLine)); //format 1 |
| 516 | 516 | $frameLine = join('<span class="x">☢</span>', explode("\x81", $frameLine)); //special bit |
| 517 | | - $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
| | 517 | + $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
| 518 | 518 | $frameLine = join('<span class="c">◷</span>', explode("\x91", $frameLine)); //clock 1 |
| 519 | | - $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
| | 519 | + $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
| 520 | 520 | $frameLine = join('<span class="f">▒</span>', explode("\x89", $frameLine)); //version |
| 521 | 521 | $frameLine = join('♦', explode("\x01", $frameLine)); |
| 522 | 522 | $frameLine = join('⋅', explode("\0", $frameLine)); |
| Index: branches/REL1_17/extensions/QrCode/phpqrcode/index.php |
| — | — | @@ -73,19 +73,19 @@ |
| 74 | 74 |
|
| 75 | 75 | //config form
|
| 76 | 76 | echo '<form action="index.php" method="post">
|
| 77 | | - Data: <input name="data" value="'.(isset($_REQUEST['data'])?htmlspecialchars($_REQUEST['data']):'PHP QR Code :)').'" />
|
| 78 | | - ECC: <select name="level">
|
| | 77 | + Data: <input name="data" value="'.(isset($_REQUEST['data'])?htmlspecialchars($_REQUEST['data']):'PHP QR Code :)').'" /> 
|
| | 78 | + ECC: <select name="level">
|
| 79 | 79 | <option value="L"'.(($errorCorrectionLevel=='L')?' selected':'').'>L - smallest</option>
|
| 80 | 80 | <option value="M"'.(($errorCorrectionLevel=='M')?' selected':'').'>M</option>
|
| 81 | 81 | <option value="Q"'.(($errorCorrectionLevel=='Q')?' selected':'').'>Q</option>
|
| 82 | 82 | <option value="H"'.(($errorCorrectionLevel=='H')?' selected':'').'>H - best</option>
|
| 83 | | - </select>
|
| 84 | | - Size: <select name="size">';
|
| | 83 | + </select> 
|
| | 84 | + Size: <select name="size">';
|
| 85 | 85 |
|
| 86 | 86 | for($i=1;$i<=10;$i++)
|
| 87 | 87 | echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';
|
| 88 | 88 |
|
| 89 | | - echo '</select>
|
| | 89 | + echo '</select> 
|
| 90 | 90 | <input type="submit" value="GENERATE"></form><hr/>';
|
| 91 | 91 |
|
| 92 | 92 | // benchmark |
| Index: branches/REL1_17/extensions/QrCode/phpqrcode/phpqrcode.php |
| — | — | @@ -802,7 +802,7 @@ |
| 803 | 803 | if ($binary_mode) { |
| 804 | 804 | |
| 805 | 805 | foreach ($frame as &$frameLine) { |
| 806 | | - $frameLine = join('<span class="m"> </span>', explode('0', $frameLine)); |
| | 806 | + $frameLine = join('<span class="m">  </span>', explode('0', $frameLine)); |
| 807 | 807 | $frameLine = join('██', explode('1', $frameLine)); |
| 808 | 808 | } |
| 809 | 809 | |
| — | — | @@ -811,23 +811,23 @@ |
| 812 | 812 | .m { background-color: white; } |
| 813 | 813 | </style> |
| 814 | 814 | <?php |
| 815 | | - echo '<pre><tt><br/ ><br/ ><br/ > '; |
| 816 | | - echo join("<br/ > ", $frame); |
| | 815 | + echo '<pre><tt><br/ ><br/ ><br/ >        '; |
| | 816 | + echo join("<br/ >        ", $frame); |
| 817 | 817 | echo '</tt></pre><br/ ><br/ ><br/ ><br/ ><br/ ><br/ >'; |
| 818 | 818 | |
| 819 | 819 | } else { |
| 820 | 820 | |
| 821 | 821 | foreach ($frame as &$frameLine) { |
| 822 | | - $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
| | 822 | + $frameLine = join('<span class="m"> </span>', explode("\xc0", $frameLine)); |
| 823 | 823 | $frameLine = join('<span class="m">▒</span>', explode("\xc1", $frameLine)); |
| 824 | | - $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
| | 824 | + $frameLine = join('<span class="p"> </span>', explode("\xa0", $frameLine)); |
| 825 | 825 | $frameLine = join('<span class="p">▒</span>', explode("\xa1", $frameLine)); |
| 826 | 826 | $frameLine = join('<span class="s">◇</span>', explode("\x84", $frameLine)); //format 0 |
| 827 | 827 | $frameLine = join('<span class="s">◆</span>', explode("\x85", $frameLine)); //format 1 |
| 828 | 828 | $frameLine = join('<span class="x">☢</span>', explode("\x81", $frameLine)); //special bit |
| 829 | | - $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
| | 829 | + $frameLine = join('<span class="c"> </span>', explode("\x90", $frameLine)); //clock 0 |
| 830 | 830 | $frameLine = join('<span class="c">◷</span>', explode("\x91", $frameLine)); //clock 1 |
| 831 | | - $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
| | 831 | + $frameLine = join('<span class="f"> </span>', explode("\x88", $frameLine)); //version |
| 832 | 832 | $frameLine = join('<span class="f">▒</span>', explode("\x89", $frameLine)); //version |
| 833 | 833 | $frameLine = join('♦', explode("\x01", $frameLine)); |
| 834 | 834 | $frameLine = join('⋅', explode("\0", $frameLine)); |
| Index: branches/REL1_17/extensions/EmailPage/EmailPage_body.php |
| — | — | @@ -160,7 +160,7 @@ |
| 161 | 161 | $wgOut->addHTML( "<tr><td colspan=\"2\" align=\"right\">" ); |
| 162 | 162 | $wgOut->addHTML( Xml::element( 'input', array( 'type' => 'hidden', 'name' => 'ea-title', 'value' => $this->title ) ) ); |
| 163 | 163 | $wgOut->addHTML( Xml::element( 'input', array( 'id' => 'ea-show', 'type' => 'submit', 'name' => 'ea-show', 'value' => wfMsg( 'ea-show' ) ) ) ); |
| 164 | | - $wgOut->addHTML( " " ); |
| | 164 | + $wgOut->addHTML( "  " ); |
| 165 | 165 | $wgOut->addHTML( Xml::element( 'input', array( 'type' => 'submit', 'name' => 'ea-send', 'value' => wfMsg( 'ea-send' ) ) ) . ' ' ); |
| 166 | 166 | $wgOut->addHTML( "</td></tr>" ); |
| 167 | 167 | |
| Index: branches/REL1_17/extensions/EmailPage/PHPMailer_v5.1/language/phpmailer.lang-fi.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | $PHPMAILER_LANG['instantiate'] = 'mail-funktion luonti epäonnistui.'; |
| 19 | 19 | //$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; |
| 20 | 20 | $PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.'; |
| 21 | | -$PHPMAILER_LANG['provide_address'] = 'Aseta vähintään yksi vastaanottajan sähköpostiosoite.'; |
| | 21 | +$PHPMAILER_LANG['provide_address'] = 'Aseta vähintään yksi vastaanottajan sähköpostiosoite.'; |
| 22 | 22 | $PHPMAILER_LANG['recipients_failed'] = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.'; |
| 23 | 23 | $PHPMAILER_LANG['encoding'] = 'Tuntematon koodaustyyppi: '; |
| 24 | 24 | //$PHPMAILER_LANG['signing'] = 'Signing Error: '; |
| Index: branches/REL1_17/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1744,7 +1744,7 @@ |
| 1745 | 1745 | $labelMsg = wfMsgExt( 'revreview-check-flag-u', 'parseinline' ); |
| 1746 | 1746 | } |
| 1747 | 1747 | $label = Xml::element( 'label', $attribs, $labelMsg ); |
| 1748 | | - $checkboxes['reviewed'] = $checkbox . ' ' . $label; |
| | 1748 | + $checkboxes['reviewed'] = $checkbox . ' ' . $label; |
| 1749 | 1749 | } |
| 1750 | 1750 | return true; |
| 1751 | 1751 | } |
| Index: branches/REL1_17/extensions/skins/p2wiki/P2wiki.skin.php |
| — | — | @@ -317,7 +317,7 @@ |
| 318 | 318 | <!-- /dataAfterContent --> |
| 319 | 319 | <?php endif; ?> |
| 320 | 320 | </div> |
| 321 | | - <div class="bottom_of_entry"> </div> |
| | 321 | + <div class="bottom_of_entry"> </div> |
| 322 | 322 | <div class="visualClear"></div> |
| 323 | 323 | </div> |
| 324 | 324 | |
| Index: branches/REL1_17/phase3/maintenance/updateCollation.php |
| — | — | @@ -10,7 +10,7 @@ |
| 11 | 11 | require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| 12 | 12 | |
| 13 | 13 | class UpdateCollation extends Maintenance { |
| 14 | | - const BATCH_SIZE = 1000; |
| | 14 | + const BATCH_SIZE = 50; |
| 15 | 15 | |
| 16 | 16 | public function __construct() { |
| 17 | 17 | parent::__construct(); |
| — | — | @@ -26,9 +26,20 @@ |
| 27 | 27 | $this->addOption( 'force', 'Run on all rows, even if the collation is ' . |
| 28 | 28 | 'supposed to be up-to-date.' ); |
| 29 | 29 | } |
| | 30 | + |
| | 31 | + public function syncDBs() { |
| | 32 | + $lb = wfGetLB(); |
| | 33 | + // bug 27975 - Don't try to wait for slaves if there are none |
| | 34 | + // Prevents permission error when getting master position |
| | 35 | + if ( $lb->getServerCount() > 1 ) { |
| | 36 | + $dbw = $lb->getConnection( DB_MASTER ); |
| | 37 | + $pos = $dbw->getMasterPos(); |
| | 38 | + $lb->waitForAll( $pos ); |
| | 39 | + } |
| | 40 | + } |
| 30 | 41 | |
| 31 | 42 | public function execute() { |
| 32 | | - global $wgCategoryCollation; |
| | 43 | + global $wgCategoryCollation, $wgMiserMode; |
| 33 | 44 | |
| 34 | 45 | $dbw = wfGetDB( DB_MASTER ); |
| 35 | 46 | $force = $this->getOption( 'force' ); |
| — | — | @@ -36,30 +47,33 @@ |
| 37 | 48 | $options = array( 'LIMIT' => self::BATCH_SIZE ); |
| 38 | 49 | |
| 39 | 50 | if ( $force ) { |
| | 51 | + $options['ORDER BY'] = 'cl_from, cl_to'; |
| 40 | 52 | $collationConds = array(); |
| 41 | | - $options['ORDER BY'] = 'cl_from, cl_to'; |
| 42 | 53 | } else { |
| 43 | 54 | $collationConds = array( 0 => |
| 44 | 55 | 'cl_collation != ' . $dbw->addQuotes( $wgCategoryCollation ) ); |
| 45 | 56 | |
| 46 | | - $count = $dbw->selectField( |
| 47 | | - 'categorylinks', |
| 48 | | - 'COUNT(*)', |
| 49 | | - $collationConds, |
| 50 | | - __METHOD__ |
| 51 | | - ); |
| | 57 | + if ( !$wgMiserMode ) { |
| | 58 | + $count = $dbw->selectField( |
| | 59 | + 'categorylinks', |
| | 60 | + 'COUNT(*)', |
| | 61 | + $collationConds, |
| | 62 | + __METHOD__ |
| | 63 | + ); |
| 52 | 64 | |
| 53 | | - if ( $count == 0 ) { |
| 54 | | - $this->output( "Collations up-to-date.\n" ); |
| 55 | | - return; |
| | 65 | + if ( $count == 0 ) { |
| | 66 | + $this->output( "Collations up-to-date.\n" ); |
| | 67 | + return; |
| | 68 | + } |
| | 69 | + $this->output( "Fixing collation for $count rows.\n" ); |
| 56 | 70 | } |
| 57 | | - $this->output( "Fixing collation for $count rows.\n" ); |
| 58 | 71 | } |
| 59 | 72 | |
| 60 | 73 | $count = 0; |
| 61 | 74 | $row = false; |
| 62 | 75 | $batchConds = array(); |
| 63 | 76 | do { |
| | 77 | + $this->output( 'Processing next ' . self::BATCH_SIZE . ' rows... '); |
| 64 | 78 | $res = $dbw->select( |
| 65 | 79 | array( 'categorylinks', 'page' ), |
| 66 | 80 | array( 'cl_from', 'cl_to', 'cl_sortkey_prefix', 'cl_collation', |
| — | — | @@ -121,6 +135,8 @@ |
| 122 | 136 | |
| 123 | 137 | $count += $res->numRows(); |
| 124 | 138 | $this->output( "$count done.\n" ); |
| | 139 | + |
| | 140 | + $this->syncDBs(); |
| 125 | 141 | } while ( $res->numRows() == self::BATCH_SIZE ); |
| 126 | 142 | } |
| 127 | 143 | } |
| Index: branches/REL1_17/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -338,6 +338,18 @@ |
| 339 | 339 | } |
| 340 | 340 | wfProfileOut( __METHOD__ ); |
| 341 | 341 | } |
| | 342 | + |
| | 343 | + /** |
| | 344 | + * Set the master wait position and wait for ALL slaves to catch up to it |
| | 345 | + */ |
| | 346 | + public function waitForAll( $pos ) { |
| | 347 | + wfProfileIn( __METHOD__ ); |
| | 348 | + $this->mWaitForPos = $pos; |
| | 349 | + for ( $i = 1; $i < count( $this->mServers ); $i++ ) { |
| | 350 | + $this->doWait( $i ); |
| | 351 | + } |
| | 352 | + wfProfileOut( __METHOD__ ); |
| | 353 | + } |
| 342 | 354 | |
| 343 | 355 | /** |
| 344 | 356 | * Get any open connection to a given server index, local or foreign |
| Property changes on: branches/REL1_17/phase3/includes/db/LoadBalancer.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 345 | 357 | Merged /trunk/phase3/includes/db/LoadBalancer.php:r82413,82699,83529,83545,83874,85544,85598,86049,86065,86346,86477-86479 |
| Index: branches/REL1_17/phase3/includes/SpecialPage.php |
| — | — | @@ -834,7 +834,7 @@ |
| 835 | 835 | * Default execute method |
| 836 | 836 | * Checks user permissions, calls the function given in mFunction |
| 837 | 837 | * |
| 838 | | - * This may be overridden by subclasses. |
| | 838 | + * This must be overridden by subclasses; it will be made abstract in a future version |
| 839 | 839 | */ |
| 840 | 840 | function execute( $par ) { |
| 841 | 841 | global $wgUser; |
| Property changes on: branches/REL1_17/phase3/includes/SpecialPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 842 | 842 | Merged /trunk/phase3/includes/SpecialPage.php:r82413,82699,83529,83545,83874,85544,85598,86049,86346,86477-86479 |