Per suggestion on wikitech-l, use "Create( this page)" instead of "Edit( this page...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 19efca4..287c9c0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,7 +40,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   redirects to the redirect table
 * Add links to page and file deletion forms to edit predefined delete reasons 
 * (bug 13269) Added MediaWiki:Uploadfooter to the bottom of Special:Upload
-* (bug 2815) Search results for media files now use thumb instead of text extract
+* (bug 2815) Search results for media now use thumb instead of text extract
+* When a page doesn't exist, the tab should say "create", not "edit"
 
 === Bug fixes in 1.13 ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 5610f3b..5ba8fdb 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1283,11 +1283,13 @@ END;
        function editThisPage() {
                global $wgOut, $wgTitle;
 
-               if ( ! $wgOut->isArticleRelated() ) {
+               if ( !$wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
-                       if ( $wgTitle->userCan( 'edit' ) ) {
+                       if( $wgTitle->userCan( 'edit' ) && $wgTitle->exists() ) {
                                $t = wfMsg( 'editthispage' );
+                       } elseif( $wgTitle->userCan( 'create' ) && !$wgTitle->exists() ) {
+                               $t = wfMsg( 'create-this-page' );
                        } else {
                                $t = wfMsg( 'viewsource' );
                        }

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 0178b86..dd72dbd 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -677,7 +677,9 @@ class SkinTemplate extends Skin {
                                $istalkclass = $istalk?' istalk':'';
                                $content_actions['edit'] = array(
                                        'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
-                                       'text' => wfMsg('edit'),
+                                       'text' => $this->mTitle->exists()
+                                               ? wfMsg( 'edit' )
+                                               : wfMsg( 'create' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index da0829f..0da6748 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -619,7 +619,9 @@ XHTML id names.
 'permalink'         => 'Permanent link',
 'print'             => 'Print',
 'edit'              => 'Edit',
+'create'            => 'Create',
 'editthispage'      => 'Edit this page',
+'create-this-page'  => 'Create this page',
 'delete'            => 'Delete',
 'deletethispage'    => 'Delete this page',
 'undelete_short'    => 'Undelete {{PLURAL:$1|one edit|$1 edits}}',