Index: Article.php
===================================================================
RCS file: /cvsroot/wikipedia/phpwiki/newcodebase/Article.php,v
retrieving revision 1.101
diff -c -r1.101 Article.php
*** Article.php 1 Nov 2002 13:35:31 -0000 1.101
--- Article.php 7 Nov 2002 11:41:44 -0000
***************
*** 329,335 ****
function editForm( $formtype )
{
global $wgOut, $wgUser, $wgTitle;
! global $wpTextbox1, $wpSummary, $wpSave, $wpPreview;
global $wpMinoredit, $wpEdittime, $wpTextbox2, $wpCountable;
global $oldid, $redirect;
--- 329,336 ----
function editForm( $formtype )
{
global $wgOut, $wgUser, $wgTitle;
! global $wpTextbox1, $wpSummary, $wpWatchthis;
! global $wpSave, $wpPreview;
global $wpMinoredit, $wpEdittime, $wpTextbox2, $wpCountable;
global $oldid, $redirect;
***************
*** 362,368 ****
return;
}
$this->mCountAdjustment = $this->isCountable( $wpTextbox1 );
! $this->insertNewArticle( $wpTextbox1, $wpSummary, $wpMinoredit );
return;
}
# Article exists. Check for edit conflict.
--- 363,369 ----
return;
}
$this->mCountAdjustment = $this->isCountable( $wpTextbox1 );
! $this->insertNewArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis );
return;
}
# Article exists. Check for edit conflict.
***************
*** 381,387 ****
$this->mCountAdjustment = $this->isCountable( $wpTextbox1 ) -
$wpCountable;
! $this->updateArticle( $wpTextbox1, $wpSummary, $wpMinoredit );
return;
}
}
--- 382,388 ----
$this->mCountAdjustment = $this->isCountable( $wpTextbox1 ) -
$wpCountable;
! $this->updateArticle( $wpTextbox1, $wpSummary, $wpMinoredit, $wpWatchthis );
return;
}
}
***************
*** 425,432 ****
if ( "no" == $redirect ) { $q .= "&redirect=no"; }
$action = wfEscapeHTML( wfLocalUrl( $wgTitle->getPrefixedURL(), $q ) );
! $summary = wfMsg( "summary" );
$minor = wfMsg( "minoredit" );
$save = wfMsg( "savearticle" );
$prev = wfMsg( "showpreview" );
--- 426,434 ----
if ( "no" == $redirect ) { $q .= "&redirect=no"; }
$action = wfEscapeHTML( wfLocalUrl( $wgTitle->getPrefixedURL(), $q ) );
! $summary = wfMsg( "summary" );
$minor = wfMsg( "minoredit" );
+ $watchthis = wfMsg ("watchthis");
$save = wfMsg( "savearticle" );
$prev = wfMsg( "showpreview" );
***************
*** 440,445 ****
--- 442,462 ----
$wpTextbox1 = wfEscapeHTML( $wpTextbox1 );
$wpTextbox2 = wfEscapeHTML( $wpTextbox2 );
$wpSummary = wfEscapeHTML( $wpSummary );
+
+ // activate checkbox if user wants it to be always active
+ if ($wgUser->getOption("watchdefault")) $wpWatchthis=1;
+
+ // activate checkbox also if user is already watching the page,
+ // require wpWatchthis to be unset so that second condition is not
+ // checked unnecessarily
+ if (!$wpWatchthis && !$wpPreview && $wgTitle->userIsWatching()) $wpWatchthis=1;
+
+ if ( 0 != $wgUser->getID() ) {
+
+ $watchhtml="{$watchthis}
";
+ } else {
+ $watchhtml="
";
+ }
$wgOut->addHTML( "