| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -873,7 +873,7 @@ |
| 874 | 874 | 'href' => $title->getLocalURL( $this->editUrlOptions() ), |
| 875 | 875 | 'primary' => true, // don't collapse this in vector |
| 876 | 876 | ); |
| 877 | | - |
| | 877 | + |
| 878 | 878 | // section link |
| 879 | 879 | if ( $showNewSection ) { |
| 880 | 880 | // Adds new section link |
| — | — | @@ -982,7 +982,7 @@ |
| 983 | 983 | // Checks that language conversion is enabled and variants exist |
| 984 | 984 | // And if it is not in the special namespace |
| 985 | 985 | if( count( $variants ) > 1 ) { |
| 986 | | - // Gets preferred variant (note that user preference is |
| | 986 | + // Gets preferred variant (note that user preference is |
| 987 | 987 | // only possible for wiki content language variant) |
| 988 | 988 | $preferred = $pageLang->getPreferredVariant(); |
| 989 | 989 | // Loops over each variant |
| — | — | @@ -1452,6 +1452,7 @@ |
| 1453 | 1453 | * This is in reality the same list as already stored in personal_urls |
| 1454 | 1454 | * however it is reformatted so that you can just pass the individual items |
| 1455 | 1455 | * to makeListItem instead of hardcoding the element creation boilerplate. |
| | 1456 | + * @return array |
| 1456 | 1457 | */ |
| 1457 | 1458 | function getPersonalTools() { |
| 1458 | 1459 | $personal_tools = array(); |
| — | — | @@ -1485,7 +1486,7 @@ |
| 1486 | 1487 | if ( !isset( $sidebar['LANGUAGES'] ) ) { |
| 1487 | 1488 | $sidebar['LANGUAGES'] = true; |
| 1488 | 1489 | } |
| 1489 | | - |
| | 1490 | + |
| 1490 | 1491 | if ( !isset( $options['search'] ) || $options['search'] !== true ) { |
| 1491 | 1492 | unset( $sidebar['SEARCH'] ); |
| 1492 | 1493 | } |
| — | — | @@ -1495,7 +1496,7 @@ |
| 1496 | 1497 | if ( isset( $options['languages'] ) && $options['languages'] === false ) { |
| 1497 | 1498 | unset( $sidebar['LANGUAGES'] ); |
| 1498 | 1499 | } |
| 1499 | | - |
| | 1500 | + |
| 1500 | 1501 | $boxes = array(); |
| 1501 | 1502 | foreach ( $sidebar as $boxName => $content ) { |
| 1502 | 1503 | if ( $content === false ) { |
| — | — | @@ -1529,7 +1530,7 @@ |
| 1530 | 1531 | 'generated' => false, |
| 1531 | 1532 | 'content' => $this->data['language_urls'], |
| 1532 | 1533 | ); |
| 1533 | | - } |
| | 1534 | + } |
| 1534 | 1535 | break; |
| 1535 | 1536 | default: |
| 1536 | 1537 | $msgObj = $this->getMsg( $boxName ); |
| — | — | @@ -1542,7 +1543,7 @@ |
| 1543 | 1544 | break; |
| 1544 | 1545 | } |
| 1545 | 1546 | } |
| 1546 | | - |
| | 1547 | + |
| 1547 | 1548 | // HACK: Compatibility with extensions still using SkinTemplateToolboxEnd |
| 1548 | 1549 | $hookContents = null; |
| 1549 | 1550 | if ( isset( $boxes['TOOLBOX'] ) ) { |
| — | — | @@ -1557,7 +1558,7 @@ |
| 1558 | 1559 | } |
| 1559 | 1560 | } |
| 1560 | 1561 | // END hack |
| 1561 | | - |
| | 1562 | + |
| 1562 | 1563 | if ( isset( $options['htmlOnly'] ) && $options['htmlOnly'] === true ) { |
| 1563 | 1564 | foreach ( $boxes as $boxName => $box ) { |
| 1564 | 1565 | if ( is_array( $box['content'] ) ) { |
| — | — | @@ -1567,7 +1568,7 @@ |
| 1568 | 1569 | } |
| 1569 | 1570 | // HACK, shove the toolbox end onto the toolbox if we're rendering itself |
| 1570 | 1571 | if ( $hookContents ) { |
| 1571 | | - $content .= "\n $hookContents"; |
| | 1572 | + $content .= "\n $hookContents"; |
| 1572 | 1573 | } |
| 1573 | 1574 | // END hack |
| 1574 | 1575 | $content .= "\n</ul>\n"; |
| — | — | @@ -1597,7 +1598,7 @@ |
| 1598 | 1599 | // END hack |
| 1599 | 1600 | } |
| 1600 | 1601 | } |
| 1601 | | - |
| | 1602 | + |
| 1602 | 1603 | return $boxes; |
| 1603 | 1604 | } |
| 1604 | 1605 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2250,7 +2250,7 @@ |
| 2251 | 2251 | * Use a user's real name inside the user interface for display instead of the username |
| 2252 | 2252 | * (experimental) |
| 2253 | 2253 | */ |
| 2254 | | -$wgRealNameInInterface = true; |
| | 2254 | +$wgRealNameInInterface = false; |
| 2255 | 2255 | |
| 2256 | 2256 | /** |
| 2257 | 2257 | * Site notice shown at the top of each page |