Index: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php (revision 41915)
+++ trunk/phase3/includes/OutputPage.php (revision 41916)
@@ -794,7 +794,8 @@
global $wgUser, $wgOutputEncoding, $wgRequest;
global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch;
- global $wgEnableMWSuggest;
+ global $wgEnableMWSuggest, $wgUniversalEditButton;
+ global $wgArticle, $wgTitle;
if( $this->mDoNothing ){
return;
@@ -901,6 +902,18 @@
$this->addScriptFile( 'rightclickedit.js' );
}
+ if( $wgUniversalEditButton ) {
+ if( isset( $wgArticle ) && isset( $wgTitle ) && $wgTitle->quickUserCan( 'edit' )
+ && ( $wgTitle->exists() || $wgTitle->quickUserCan( 'create' ) ) ) {
+ $this->addLink( array(
+ 'rel' => 'alternate',
+ 'type' => 'application/x-wiki',
+ 'title' => wfMsg( 'edit' ),
+ 'href' => $wgTitle->getFullURL( 'action=edit' )
+ ) );
+ }
+ }
+
# Buffer output; final headers may depend on later processing
ob_start();
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php (revision 41915)
+++ trunk/phase3/includes/DefaultSettings.php (revision 41916)
@@ -3462,3 +3462,10 @@
* Don't bump this, instead bump the number on [[MediaWiki:Sitenotice id]]
*/
$wgMajorSiteNoticeID = 1;
+
+/**
+* Enable the UniversalEditButton for browsers that support it
+* (currently only Firefox with an extension)
+* See http://universaleditbutton.org for more background information
+*/
+$wgUniversalEditButton = true;
\ No newline at end of file
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES (revision 41915)
+++ trunk/phase3/RELEASE-NOTES (revision 41916)
@@ -61,6 +61,7 @@
* NoMoveUserPages
* Special:Nuke to mass delete all pages created by a user
* Poem (patch by Nathaniel Herman)
+* UniversalEditButton
=== New features in 1.14 ===
