https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113036
Revision: 113036
Author: reedy
Date: 2012-03-05 14:43:13 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
MFT r112855, r112951
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/AjaxResponse.php
branches/wmf/1.19wmf1/includes/Title.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
branches/wmf/1.19wmf1/includes/Title.php
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840,112843,112866
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169-112170,112172-112173,112179,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566,112700,112750,112839-112840,112843,112855,112866,112951
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112866
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111427,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112347,112374,112378,112381,112383,112397,112408,112474,112526,112534,112563,112700,112839-112840,112843,112855,112866,112951
Modified: branches/wmf/1.19wmf1/includes/AjaxResponse.php
===================================================================
--- branches/wmf/1.19wmf1/includes/AjaxResponse.php 2012-03-05 14:31:53 UTC
(rev 113035)
+++ branches/wmf/1.19wmf1/includes/AjaxResponse.php 2012-03-05 14:43:13 UTC
(rev 113036)
@@ -180,11 +180,11 @@
$this->disable();
$this->mLastModified = $lastmod;
- wfDebug( "$fname: CACHED client: $ismodsince ;
user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+ wfDebug( "$fname: CACHED client: $ismodsince ;
user: {$wgUser->getTouched()} ; page: $timestamp ; site $wgCacheEpoch\n", false
);
return true;
} else {
- wfDebug( "$fname: READY client: $ismodsince ;
user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+ wfDebug( "$fname: READY client: $ismodsince ;
user: {$wgUser->getTouched()} ; page: $timestamp ; site $wgCacheEpoch\n", false
);
$this->mLastModified = $lastmod;
}
} else {
Modified: branches/wmf/1.19wmf1/includes/Title.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Title.php 2012-03-05 14:31:53 UTC (rev
113035)
+++ branches/wmf/1.19wmf1/includes/Title.php 2012-03-05 14:43:13 UTC (rev
113036)
@@ -3639,6 +3639,10 @@
$newpage->doEditUpdates( $nullRevision, $wgUser, array(
'changed' => false ) );
+ if ( !$moveOverRedirect ) {
+ WikiPage::onArticleCreate( $nt );
+ }
+
# Recreate the redirect, this time in the other direction.
if ( $redirectSuppressed ) {
WikiPage::onArticleDelete( $this );
Property changes on: branches/wmf/1.19wmf1/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes/Title.php:100352-107913
/branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
+ /branches/JSTesting/includes/Title.php:100352-107913
/branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:112951
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
