| Index: branches/REL1_18/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -709,6 +709,7 @@ |
| 710 | 710 | protected function getDefaultSchemaVars() { |
| 711 | 711 | $vars = parent::getDefaultSchemaVars(); |
| 712 | 712 | $vars['wgDBTableOptions'] = str_replace( 'TYPE', 'ENGINE', $GLOBALS['wgDBTableOptions'] ); |
| | 713 | + $vars['wgDBTableOptions'] = str_replace( 'CHARSET=mysql4', 'CHARSET=binary', $GLOBALS['wgDBTableOptions'] ); |
| 713 | 714 | return $vars; |
| 714 | 715 | } |
| 715 | 716 | |
| Index: branches/REL1_18/phase3/includes/parser/Parser.php |
| — | — | @@ -2942,7 +2942,7 @@ |
| 2943 | 2943 | $isLocalObj = false; # $text is a DOM node needing expansion in the current frame |
| 2944 | 2944 | |
| 2945 | 2945 | # Title object, where $text came from |
| 2946 | | - $title = null; |
| | 2946 | + $title = false; |
| 2947 | 2947 | |
| 2948 | 2948 | # $part1 is the bit before the first |, and must contain only title characters. |
| 2949 | 2949 | # Various prefixes will be stripped from it later. |
| Index: branches/REL1_18/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -219,7 +219,7 @@ |
| 220 | 220 | |
| 221 | 221 | $s = $helpHtml; |
| 222 | 222 | |
| 223 | | - $s .= Html::openElement( 'select', array( 'id' => $name, 'name' => $name ) ) . "\n"; |
| | 223 | + $s .= Html::openElement( 'select', array( 'id' => $name, 'name' => $name, 'tabindex' => $this->parent->nextTabIndex() ) ) . "\n"; |
| 224 | 224 | |
| 225 | 225 | $languages = Language::getLanguageNames(); |
| 226 | 226 | ksort( $languages ); |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 227 | 227 | Merged /trunk/phase3/includes:r102027,102414,102440,102488 |
| Index: branches/REL1_18/phase3/languages/Language.php |
| — | — | @@ -433,7 +433,7 @@ |
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | global $wgExtraGenderNamespaces; |
| 437 | | - $genders = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); |
| | 437 | + $genders = $wgExtraGenderNamespaces + (array)self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' ); |
| 438 | 438 | foreach ( $genders as $index => $forms ) { |
| 439 | 439 | foreach ( $forms as $alias ) { |
| 440 | 440 | $aliases[$alias] = $index; |
| Property changes on: branches/REL1_18/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 441 | 441 | Merged /trunk/phase3/languages:r102414,102440,102488 |
| Index: branches/REL1_18/phase3/CREDITS |
| — | — | @@ -96,6 +96,7 @@ |
| 97 | 97 | * Denny Vrandecic |
| 98 | 98 | * Erwin Dokter |
| 99 | 99 | * FunPika |
| | 100 | +* Grunny |
| 100 | 101 | * Harry Burt |
| 101 | 102 | * Ireas |
| 102 | 103 | * Jaska Zedlik |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 103 | 104 | Merged /trunk/phase3:r102027,102414,102440,102488 |