| Index: branches/REL1_18/phase3/maintenance/update.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | $this->addOption( 'quick', 'Skip 5 second countdown before starting' ); |
| 45 | 45 | $this->addOption( 'doshared', 'Also update shared tables' ); |
| 46 | 46 | $this->addOption( 'nopurge', 'Do not purge the objectcache table after updates' ); |
| 47 | | - $this->addOption( 'iknowwhatimdoing', 'Override when $wgMiserMode disables this script' ); |
| | 47 | + $this->addOption( 'force', 'Override when $wgMiserMode disables this script' ); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | function getDbType() { |
| — | — | @@ -78,10 +78,10 @@ |
| 79 | 79 | function execute() { |
| 80 | 80 | global $wgVersion, $wgTitle, $wgLang, $wgMiserMode; |
| 81 | 81 | |
| 82 | | - if( $wgMiserMode && !$this->hasOption( 'iknowwhatimdoing' ) ) { |
| | 82 | + if( $wgMiserMode && !$this->hasOption( 'force' ) ) { |
| 83 | 83 | $this->error( "Do not run update.php on this wiki. If you're seeing this you should\n" |
| 84 | 84 | . "probably ask for some help in performing your schema updates.\n\n" |
| 85 | | - . "If you know what you are doing, you can continue with --iknowwhatimdoing", true ); |
| | 85 | + . "If you know what you are doing, you can continue with --force", true ); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $wgLang = Language::factory( 'en' ); |
| Index: branches/REL1_18/phase3/skins/common/shared.css |
| — | — | @@ -18,12 +18,6 @@ |
| 19 | 19 | /* @noflip */textarea[dir="ltr"], input[dir="ltr"] { direction: ltr; } |
| 20 | 20 | /* @noflip */textarea[dir="rtl"], input[dir="rtl"] { direction: rtl; } |
| 21 | 21 | |
| 22 | | -/* The scripts of these languages are very hard to read with underlines */ |
| 23 | | -[lang="ar"] a, [lang="ckb"] a, [lang="fa"] a, [lang="kk-arab"] a, |
| 24 | | -[lang="mzn"] a, [lang="ps"] a, [lang="ur"] a { |
| 25 | | - text-decoration: none; |
| 26 | | -} |
| 27 | | - |
| 28 | 22 | /* Default style for semantic tags */ |
| 29 | 23 | abbr, acronym, .explain { |
| 30 | 24 | border-bottom: 1px dotted black; |
| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -673,6 +673,8 @@ |
| 674 | 674 | * (bug 30817) Restored linktrail for kk (Kazakh) |
| 675 | 675 | * (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces |
| 676 | 676 | * (bug 30846) New LanguageOs class |
| | 677 | +* (bug 31913) Special:MostLinkedTemplates had an incorrect GROUP BY clause |
| | 678 | + under Microsoft SQL. |
| 677 | 679 | |
| 678 | 680 | === Other changes in 1.18 === |
| 679 | 681 | * Removed legacy wgAjaxWatch javascript global object, no longer in use. |
| Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 680 | 682 | Merged /trunk/phase3/RELEASE-NOTES-1.18:r101470,101476 |
| Index: branches/REL1_18/phase3/includes/HTMLForm.php |
| — | — | @@ -1319,7 +1319,10 @@ |
| 1320 | 1320 | } |
| 1321 | 1321 | |
| 1322 | 1322 | // GetCheck won't work like we want for checks. |
| 1323 | | - if ( $request->getCheck( 'wpEditToken' ) || $this->mParent->getMethod() != 'post' ) { |
| | 1323 | + // Fetch the value in either one of the two following case: |
| | 1324 | + // - we have a valid token (form got posted or GET forged by the user) |
| | 1325 | + // - checkbox name has a value (false or true), ie is not null |
| | 1326 | + if ( $request->getCheck( 'wpEditToken' ) || $request->getVal( $this->mName )!== null ) { |
| 1324 | 1327 | // XOR has the following truth table, which is what we want |
| 1325 | 1328 | // INVERT VALUE | OUTPUT |
| 1326 | 1329 | // true true | false |
| Index: branches/REL1_18/phase3/includes/OutputPage.php |
| — | — | @@ -1596,7 +1596,7 @@ |
| 1597 | 1597 | $this->mVaryHeader[$header] = $option; |
| 1598 | 1598 | } |
| 1599 | 1599 | } |
| 1600 | | - $this->mVaryHeader[$header] = array_unique( $this->mVaryHeader[$header] ); |
| | 1600 | + $this->mVaryHeader[$header] = array_unique( (array)$this->mVaryHeader[$header] ); |
| 1601 | 1601 | } |
| 1602 | 1602 | |
| 1603 | 1603 | /** |
| Property changes on: branches/REL1_18/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1604 | 1604 | Merged /trunk/phase3/includes/OutputPage.php:r101376,101417,101420,101445 |
| Index: branches/REL1_18/phase3/includes/installer/Installer.php |
| — | — | @@ -972,7 +972,10 @@ |
| 973 | 973 | protected function envCheckSuhosinMaxValueLength() { |
| 974 | 974 | $maxValueLength = ini_get( 'suhosin.get.max_value_length' ); |
| 975 | 975 | if ( $maxValueLength > 0 ) { |
| 976 | | - $this->showMessage( 'config-suhosin-max-value-length', $maxValueLength ); |
| | 976 | + if( $maxValueLength < 1024 ) { |
| | 977 | + # Only warn if the value is below the sane 1024 |
| | 978 | + $this->showMessage( 'config-suhosin-max-value-length', $maxValueLength ); |
| | 979 | + } |
| 977 | 980 | } else { |
| 978 | 981 | $maxValueLength = -1; |
| 979 | 982 | } |
| Index: branches/REL1_18/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -623,6 +623,7 @@ |
| 624 | 624 | 'config-admin-password' => '{{Identical|Password}}', |
| 625 | 625 | 'config-admin-email' => '{{Identical|E-mail address}}', |
| 626 | 626 | 'config-subscribe' => 'Used as label for the installer checkbox', |
| | 627 | + 'config-suhosin-max-value-length' => 'Message shown when PHP parameter suhosin.get.max_value_length is between 0 and 1023 (that max value is hard set in MediaWiki software', |
| 627 | 628 | 'config-profile-help' => 'Messages referenced: |
| 628 | 629 | * {{msg-mw|config-profile-wiki}} |
| 629 | 630 | * {{msg-mw|config-profile-no-anon}} |
| Index: branches/REL1_18/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -409,7 +409,7 @@ |
| 410 | 410 | ' parsedcomment - Adds parsed comment of the edit', |
| 411 | 411 | ' timestamp - Adds timestamp of the edit', |
| 412 | 412 | ' patrol - Tags edits that are patrolled', |
| 413 | | - ' size - Adds the old and new lengths of the page', |
| | 413 | + ' sizes - Adds the old and new lengths of the page', |
| 414 | 414 | ' notificationtimestamp - Adds timestamp of when the user was last notified about the edit', |
| 415 | 415 | ' loginfo - Adds log information where appropriate', |
| 416 | 416 | ), |
| Property changes on: branches/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 417 | 417 | Merged /trunk/phase3/includes/api:r101314,101370,101376,101417,101420,101445 |
| Index: branches/REL1_18/phase3/includes/resourceloader/ResourceLoaderUserOptionsModule.php |
| — | — | @@ -93,7 +93,11 @@ |
| 94 | 94 | $rules = array(); |
| 95 | 95 | if ( $options['underline'] < 2 ) { |
| 96 | 96 | $rules[] = "a { text-decoration: " . |
| 97 | | - ( $options['underline'] ? 'underline !important' : 'none' ) . "; }"; |
| | 97 | + ( $options['underline'] ? 'underline' : 'none' ) . "; }"; |
| | 98 | + } else { |
| | 99 | + # The scripts of these languages are very hard to read with underlines |
| | 100 | + $rules[] = 'a:lang(ar), a:lang(ckb), a:lang(fa),a:lang(kk-arab), ' . |
| | 101 | + 'a:lang(mzn), a:lang(ps), a:lang(ur) { text-decoration: none; }'; |
| 98 | 102 | } |
| 99 | 103 | if ( $options['highlightbroken'] ) { |
| 100 | 104 | $rules[] = "a.new, #quickbar a.new { color: #ba0000; }\n"; |
| Index: branches/REL1_18/phase3/includes/specials/SpecialMostlinkedtemplates.php |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | 'tl_title AS title', |
| 70 | 70 | 'COUNT(*) AS value' ), |
| 71 | 71 | 'conds' => array ( 'tl_namespace' => NS_TEMPLATE ), |
| 72 | | - 'options' => array( 'GROUP BY' => 'namespace, title' ) |
| | 72 | + 'options' => array( 'GROUP BY' => 'tl_namespace, tl_title' ) |
| 73 | 73 | ); |
| 74 | 74 | } |
| 75 | 75 | |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 76 | 76 | Merged /trunk/phase3/includes/specials:r101470,101476 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 77 | 77 | Merged /trunk/phase3/includes:r101314,101370,101376,101417,101420,101445,101464,101470,101476 |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.js |
| — | — | @@ -229,7 +229,7 @@ |
| 230 | 230 | * @param $table jQuery object for a <table> |
| 231 | 231 | */ |
| 232 | 232 | function emulateTHeadAndFoot( $table ) { |
| 233 | | - var $rows = $table.find( 'tr' ); |
| | 233 | + var $rows = $table.find( '> tbody > tr' ); |
| 234 | 234 | if( !$table.get(0).tHead ) { |
| 235 | 235 | var $thead = $( '<thead>' ); |
| 236 | 236 | $rows.each( function() { |
| — | — | @@ -269,7 +269,7 @@ |
| 270 | 270 | }); |
| 271 | 271 | $tableHeaders = $( longest ); |
| 272 | 272 | } |
| 273 | | - $tableHeaders = $tableHeaders.find( 'th' ).each( function( index ) { |
| | 273 | + $tableHeaders = $tableHeaders.children( 'th' ).each( function( index ) { |
| 274 | 274 | this.column = realCellIndex; |
| 275 | 275 | |
| 276 | 276 | var colspan = this.colspan; |
| — | — | @@ -441,13 +441,13 @@ |
| 442 | 442 | |
| 443 | 443 | function explodeRowspans( $table ) { |
| 444 | 444 | // Split multi row cells into multiple cells with the same content |
| 445 | | - $table.find( 'tbody [rowspan]' ).each(function() { |
| | 445 | + $table.find( '> tbody > tr > [rowspan]' ).each(function() { |
| 446 | 446 | var rowSpan = this.rowSpan; |
| 447 | 447 | this.rowSpan = 1; |
| 448 | 448 | var cell = $( this ); |
| 449 | 449 | var next = cell.parent().nextAll(); |
| 450 | 450 | for ( var i = 0; i < rowSpan - 1; i++ ) { |
| 451 | | - var td = next.eq( i ).find( 'td' ); |
| | 451 | + var td = next.eq( i ).children( 'td' ); |
| 452 | 452 | if ( !td.length ) { |
| 453 | 453 | next.eq( i ).append( cell.clone() ); |
| 454 | 454 | } else if ( this.cellIndex === 0 ) { |
| — | — | @@ -598,10 +598,10 @@ |
| 599 | 599 | // Legacy fix of .sortbottoms |
| 600 | 600 | // Wrap them inside inside a tfoot (because that's what they actually want to be) & |
| 601 | 601 | // and put the <tfoot> at the end of the <table> |
| 602 | | - var $sortbottoms = $table.find( 'tr.sortbottom' ); |
| | 602 | + var $sortbottoms = $table.find( '> tbody > tr.sortbottom' ); |
| 603 | 603 | if ( $sortbottoms.length ) { |
| 604 | | - var $tfoot = $table.find( 'tfoot' ); |
| 605 | | - if( $tfoot.length ) { |
| | 604 | + var $tfoot = $table.children( 'tfoot' ); |
| | 605 | + if ( $tfoot.length ) { |
| 606 | 606 | $tfoot.eq(0).prepend( $sortbottoms ); |
| 607 | 607 | } else { |
| 608 | 608 | $table.append( $( '<tfoot>' ).append( $sortbottoms ) ) |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 609 | 609 | Merged /trunk/phase3:r101314,101370,101376,101417,101420,101445,101464,101470,101476 |