dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Drop outdated "documentation reviewed" tags"
[lhc/web/wiklou.git]
/
includes
/
page
/
WikiPage.php
diff --git
a/includes/page/WikiPage.php
b/includes/page/WikiPage.php
index
fe61f6f
..
5527ace
100644
(file)
--- a/
includes/page/WikiPage.php
+++ b/
includes/page/WikiPage.php
@@
-31,8
+31,6
@@
interface Page {
*
* Some fields are public only for backwards-compatibility. Use accessors.
* In the past, this class was part of Article.php and everything was public.
*
* Some fields are public only for backwards-compatibility. Use accessors.
* In the past, this class was part of Article.php and everything was public.
- *
- * @internal documentation reviewed 15 Mar 2010
*/
class WikiPage implements Page, IDBAccessObject {
// Constants for $mDataLoadedFrom and related
*/
class WikiPage implements Page, IDBAccessObject {
// Constants for $mDataLoadedFrom and related
@@
-1608,7
+1606,9
@@
class WikiPage implements Page, IDBAccessObject {
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
- * @param bool|int $baseRevId The revision ID this edit was based off, if any
+ * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+ * This is not the parent revision ID, rather the revision ID for older
+ * content used as the source for a rollback, for example.
* @param User $user The user doing the edit
*
* @throws MWException
* @param User $user The user doing the edit
*
* @throws MWException
@@
-1668,7
+1668,9
@@
class WikiPage implements Page, IDBAccessObject {
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
* error will be returned. These two conditions are also possible with
* auto-detection due to MediaWiki's performance-optimised locking strategy.
*
- * @param bool|int $baseRevId The revision ID this edit was based off, if any
+ * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+ * This is not the parent revision ID, rather the revision ID for older
+ * content used as the source for a rollback, for example.
* @param User $user The user doing the edit
* @param string $serialFormat Format for storing the content in the
* database.
* @param User $user The user doing the edit
* @param string $serialFormat Format for storing the content in the
* database.
@@
-1802,7
+1804,7
@@
class WikiPage implements Page, IDBAccessObject {
$dbw->begin( __METHOD__ );
try {
$dbw->begin( __METHOD__ );
try {
- $prepStatus = $content->prepareSave( $this, $flags, $
baseRevI
d, $user );
+ $prepStatus = $content->prepareSave( $this, $flags, $
oldi
d, $user );
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
@@
-1881,7
+1883,7
@@
class WikiPage implements Page, IDBAccessObject {
$dbw->begin( __METHOD__ );
try {
$dbw->begin( __METHOD__ );
try {
- $prepStatus = $content->prepareSave( $this, $flags, $
baseRevI
d, $user );
+ $prepStatus = $content->prepareSave( $this, $flags, $
oldi
d, $user );
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
$status->merge( $prepStatus );
if ( !$status->isOK() ) {
@@
-3061,7
+3063,7
@@
class WikiPage implements Page, IDBAccessObject {
}
// Generate the edit summary if necessary
}
// Generate the edit summary if necessary
- $target = Revision::newFromId( $s->rev_id );
+ $target = Revision::newFromId( $s->rev_id
, Revision::READ_LATEST
);
if ( empty( $summary ) ) {
if ( $from == '' ) { // no public user name
$summary = wfMessage( 'revertpage-nouser' );
if ( empty( $summary ) ) {
if ( $from == '' ) { // no public user name
$summary = wfMessage( 'revertpage-nouser' );
@@
-3402,7
+3404,9
@@
class WikiPage implements Page, IDBAccessObject {
// Check if the last link refresh was before page_touched
if ( $this->getLinksTimestamp() < $this->getTouched() ) {
// Check if the last link refresh was before page_touched
if ( $this->getLinksTimestamp() < $this->getTouched() ) {
- JobQueueGroup::singleton()->push( new RefreshLinksJob( $this->mTitle, $params ) );
+ JobQueueGroup::singleton()->push( EnqueueJob::newFromLocalJobs(
+ new JobSpecification( 'refreshLinks', $params, array(), $this->mTitle )
+ ) );
return true;
}
return true;
}