| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -574,7 +574,7 @@ |
| 575 | 575 | } |
| 576 | 576 | |
| 577 | 577 | static function editingPreferences( $user, &$defaultPreferences ) { |
| 578 | | - global $wgUseExternalEditor; |
| | 578 | + global $wgUseExternalEditor, $wgLivePreview; |
| 579 | 579 | |
| 580 | 580 | ## Editing ##################################### |
| 581 | 581 | $defaultPreferences['cols'] = |
| — | — | @@ -663,12 +663,14 @@ |
| 664 | 664 | 'section' => 'editing/advancedediting', |
| 665 | 665 | 'label-message' => 'tog-forceeditsummary', |
| 666 | 666 | ); |
| 667 | | - $defaultPreferences['uselivepreview'] = |
| 668 | | - array( |
| 669 | | - 'type' => 'toggle', |
| 670 | | - 'section' => 'editing/advancedediting', |
| 671 | | - 'label-message' => 'tog-uselivepreview', |
| 672 | | - ); |
| | 667 | + if ( $wgLivePreview ) { |
| | 668 | + $defaultPreferences['uselivepreview'] = |
| | 669 | + array( |
| | 670 | + 'type' => 'toggle', |
| | 671 | + 'section' => 'editing/advancedediting', |
| | 672 | + 'label-message' => 'tog-uselivepreview', |
| | 673 | + ); |
| | 674 | + } |
| 673 | 675 | } |
| 674 | 676 | |
| 675 | 677 | static function rcPreferences( $user, &$defaultPreferences ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -186,6 +186,7 @@ |
| 187 | 187 | * (bug 19170) Special:Version should follow the content language direction |
| 188 | 188 | * (bug 19160) maintenance/purgeOldText.inc is now compatible with PostgreSQL |
| 189 | 189 | * Fixed performance regression in "bad image list" feature |
| | 190 | +* Show user preference 'Use live preview' if $wgLivePreview is enabled only |
| 190 | 191 | |
| 191 | 192 | == API changes in 1.16 == |
| 192 | 193 | |