| Index: trunk/phase3/includes/RecentChange.php |
| — | — | @@ -196,8 +196,7 @@ |
| 197 | 197 | $this->mAttribs['rc_timestamp'], |
| 198 | 198 | $this->mAttribs['rc_comment'], |
| 199 | 199 | $this->mAttribs['rc_minor'], |
| 200 | | - $this->mAttribs['rc_last_oldid'], |
| 201 | | - $this->mAttribs['rc_deleted'] ); |
| | 200 | + $this->mAttribs['rc_last_oldid'] ); |
| 202 | 201 | } |
| 203 | 202 | } |
| 204 | 203 | |
| Index: trunk/phase3/includes/EnotifNotifyJob.php |
| — | — | @@ -27,8 +27,7 @@ |
| 28 | 28 | $this->params['summary'], |
| 29 | 29 | $this->params['minorEdit'], |
| 30 | 30 | $this->params['oldid'], |
| 31 | | - $this->params['watchers'], |
| 32 | | - $this->params['deleted'] |
| | 31 | + $this->params['watchers'] |
| 33 | 32 | ); |
| 34 | 33 | return true; |
| 35 | 34 | } |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -281,7 +281,7 @@ |
| 282 | 282 | * @param $minorEdit |
| 283 | 283 | * @param $oldid (default: false) |
| 284 | 284 | */ |
| 285 | | - function notifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid = false, $deleted = false ) { |
| | 285 | + function notifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid = false) { |
| 286 | 286 | global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker; |
| 287 | 287 | |
| 288 | 288 | if ($title->getNamespace() < 0) |
| — | — | @@ -328,18 +328,16 @@ |
| 329 | 329 | "summary" => $summary, |
| 330 | 330 | "minorEdit" => $minorEdit, |
| 331 | 331 | "oldid" => $oldid, |
| 332 | | - "watchers" => $watchers, |
| 333 | | - "deleted" => $deleted |
| 334 | | - ); |
| | 332 | + "watchers" => $watchers); |
| 335 | 333 | $job = new EnotifNotifyJob( $title, $params ); |
| 336 | 334 | $job->insert(); |
| 337 | 335 | } else { |
| 338 | | - $this->actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers, $deleted ); |
| | 336 | + $this->actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers ); |
| 339 | 337 | } |
| 340 | 338 | |
| 341 | 339 | } |
| 342 | 340 | |
| 343 | | - /** |
| | 341 | + /* |
| 344 | 342 | * Immediate version of notifyOnPageChange(). |
| 345 | 343 | * |
| 346 | 344 | * Send emails corresponding to the user $editor editing the page $title. |
| — | — | @@ -352,9 +350,8 @@ |
| 353 | 351 | * @param $minorEdit bool |
| 354 | 352 | * @param $oldid int Revision ID |
| 355 | 353 | * @param $watchers array of user IDs |
| 356 | | - * @param $deleted boolean If page was deleted |
| 357 | 354 | */ |
| 358 | | - function actuallyNotifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers, $deleted ) { |
| | 355 | + function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid, $watchers) { |
| 359 | 356 | # we use $wgPasswordSender as sender's address |
| 360 | 357 | global $wgEnotifWatchlist; |
| 361 | 358 | global $wgEnotifMinorEdits, $wgEnotifUserTalk; |
| — | — | @@ -376,7 +373,6 @@ |
| 377 | 374 | $this->minorEdit = $minorEdit; |
| 378 | 375 | $this->oldid = $oldid; |
| 379 | 376 | $this->editor = $editor; |
| 380 | | - $this->deleted = $deleted; |
| 381 | 377 | $this->composed_common = false; |
| 382 | 378 | |
| 383 | 379 | $userTalkId = false; |
| — | — | @@ -454,10 +450,6 @@ |
| 455 | 451 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink ); |
| 456 | 452 | $keys['$OLDID'] = $this->oldid; |
| 457 | 453 | $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' ); |
| 458 | | - } else if( $this->deleted ) { |
| 459 | | - $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_deletedpagetext' ); |
| 460 | | - $keys['$OLDID'] = ''; |
| 461 | | - $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'deleted' ); |
| 462 | 454 | } else { |
| 463 | 455 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_newpagetext' ); |
| 464 | 456 | # clear $OLDID placeholder in the message template |
| — | — | @@ -476,8 +468,7 @@ |
| 477 | 469 | $body = strtr( $body, $keys ); |
| 478 | 470 | $pagetitle = $this->title->getPrefixedText(); |
| 479 | 471 | $keys['$PAGETITLE'] = $pagetitle; |
| 480 | | - $keys['$REVINFO'] = $this->deleted ? '' : |
| 481 | | - wfMsgForContent( 'enotif_rev_info', $this->title->getFullUrl() ); |
| | 472 | + $keys['$PAGETITLE_URL'] = $this->title->getFullUrl(); |
| 482 | 473 | |
| 483 | 474 | $keys['$PAGEMINOREDIT'] = $medit; |
| 484 | 475 | $keys['$PAGESUMMARY'] = $summary; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2611,17 +2611,14 @@ |
| 2612 | 2612 | 'enotif_impersonal_salutation' => '{{SITENAME}} user', |
| 2613 | 2613 | 'changed' => 'changed', |
| 2614 | 2614 | 'created' => 'created', |
| 2615 | | -'deleted' => 'deleted', |
| 2616 | | -'enotif_deletedpagetext' => 'This page is no longer available.', |
| 2617 | 2615 | 'enotif_subject' => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR', |
| 2618 | 2616 | 'enotif_lastvisited' => 'See $1 for all changes since your last visit.', |
| 2619 | 2617 | 'enotif_lastdiff' => 'See $1 to view this change.', |
| 2620 | 2618 | 'enotif_anon_editor' => 'anonymous user $1', |
| 2621 | | -'enotif_rev_info' => 'See $1 for the current revision.', |
| 2622 | 2619 | 'enotif_body' => 'Dear $WATCHINGUSERNAME, |
| 2623 | 2620 | |
| 2624 | 2621 | |
| 2625 | | -The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATEANDTIME by $PAGEEDITOR. $REVINFO |
| | 2622 | +The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR, see $PAGETITLE_URL for the current revision. |
| 2626 | 2623 | |
| 2627 | 2624 | $NEWPAGE |
| 2628 | 2625 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -427,8 +427,6 @@ |
| 428 | 428 | * (bug 20296) Fixed an PHP warning in Language::getMagic() in PHP 5.3 |
| 429 | 429 | * When creating accounts, don't prefill name from current username (which |
| 430 | 430 | presumably is already taken) |
| 431 | | -* (bug 15646) Page creation notification email is no longer sent when a |
| 432 | | - watched page is deleted |
| 433 | 431 | * (bug 20358) Unprotect tab was missing accesskey; now same as protect tab. |
| 434 | 432 | * (bug 20317) Cleaned up default main page link accesskey settings |
| 435 | 433 | * (bug 20362) Special:Statistics now produces valid HTML when view counters are |