https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113989
Revision: 113989
Author: reedy
Date: 2012-03-16 01:32:19 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
MFT r113988 x3
Modified Paths:
--------------
branches/REL1_18/extensions/Collection/Collection.body.php
branches/REL1_19/extensions/Collection/Collection.body.php
branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
Property Changed:
----------------
branches/REL1_18/extensions/Collection/
branches/REL1_19/extensions/Collection/
branches/wmf/1.19wmf1/extensions/Collection/
branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
Property changes on: branches/REL1_18/extensions/Collection
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/Collection:94376,98982,99059,99097,99164,99167
+ /trunk/extensions/Collection:94376,98982,99059,99097,99164,99167,113988
Modified: branches/REL1_18/extensions/Collection/Collection.body.php
===================================================================
--- branches/REL1_18/extensions/Collection/Collection.body.php 2012-03-16
01:27:49 UTC (rev 113988)
+++ branches/REL1_18/extensions/Collection/Collection.body.php 2012-03-16
01:32:19 UTC (rev 113989)
@@ -831,14 +831,14 @@
} elseif ( $item['type'] == 'article' ) {
if ( $item['currentVersion'] == 1 ) {
$articleText .= ":[[" .
$item['title'];
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .= "|" .
$item['displaytitle'];
}
$articleText .= "]]\n";
} else {
$articleText .= ":[{{fullurl:"
. $item['title'];
$articleText .= "|oldid=" .
$item['revision'] . "}} ";
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .=
$item['displaytitle'];
} else {
$articleText .=
$item['title'];
Property changes on: branches/REL1_19/extensions/Collection
___________________________________________________________________
Added: svn:mergeinfo
+
/trunk/extensions/Collection:111011,111199,111218,111484,111575,111685,111713,111715,112074,112153,112160,112229,112248,112253,112260,112295,112517,112520,112524,112562,112660,112687,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112993,113988
Modified: branches/REL1_19/extensions/Collection/Collection.body.php
===================================================================
--- branches/REL1_19/extensions/Collection/Collection.body.php 2012-03-16
01:27:49 UTC (rev 113988)
+++ branches/REL1_19/extensions/Collection/Collection.body.php 2012-03-16
01:32:19 UTC (rev 113989)
@@ -831,14 +831,14 @@
} elseif ( $item['type'] == 'article' ) {
if ( $item['currentVersion'] == 1 ) {
$articleText .= ":[[" .
$item['title'];
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .= "|" .
$item['displaytitle'];
}
$articleText .= "]]\n";
} else {
$articleText .= ":[{{fullurl:"
. $item['title'];
$articleText .= "|oldid=" .
$item['revision'] . "}} ";
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .=
$item['displaytitle'];
} else {
$articleText .=
$item['title'];
Property changes on: branches/wmf/1.19wmf1/extensions/Collection
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions/Collection:100352-107913
/branches/REL1_15/phase3/extensions/Collection:51646
/branches/REL1_17/phase3/extensions/Collection:81445,81448
/branches/new-installer/phase3/extensions/Collection:43664-66004
/branches/sqlite/extensions/Collection:58211-58321
/branches/wmf/1.18wmf1/extensions/Collection:97508
/trunk/extensions/Collection:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112739-112740,112775
/trunk/phase3/extensions/Collection:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions/Collection:100352-107913
/branches/REL1_15/phase3/extensions/Collection:51646
/branches/REL1_17/phase3/extensions/Collection:81445,81448
/branches/new-installer/phase3/extensions/Collection:43664-66004
/branches/sqlite/extensions/Collection:58211-58321
/branches/wmf/1.18wmf1/extensions/Collection:97508
/trunk/extensions/Collection:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112739-112740,112775,113988
/trunk/phase3/extensions/Collection:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Modified: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-03-16 01:27:49 UTC (rev 113988)
+++ branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
2012-03-16 01:32:19 UTC (rev 113989)
@@ -835,14 +835,14 @@
} elseif ( $item['type'] == 'article' ) {
if ( $item['currentVersion'] == 1 ) {
$articleText .= ":[[" .
$item['title'];
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .= "|" .
$item['displaytitle'];
}
$articleText .= "]]\n";
} else {
$articleText .= ":[{{fullurl:"
. $item['title'];
$articleText .= "|oldid=" .
$item['revision'] . "}} ";
- if ( $item['displaytitle'] ) {
+ if ( isset(
$item['displaytitle'] ) && $item['displaytitle'] ) {
$articleText .=
$item['displaytitle'];
} else {
$articleText .=
$item['title'];
Property changes on:
branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions/Collection/Collection.body.php:100352-107913
/branches/REL1_15/phase3/extensions/Collection/Collection.body.php:51646
/branches/REL1_17/phase3/extensions/Collection/Collection.body.php:81445,81448
/branches/new-installer/phase3/extensions/Collection/Collection.body.php:43664-66004
/branches/sqlite/extensions/Collection/Collection.body.php:58211-58321
/branches/wmf/1.18wmf1/extensions/Collection/Collection.body.php:97508
/trunk/extensions/Collection/Collection.body.php:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112739-112740,112744,112775
/trunk/phase3/extensions/Collection/Collection.body.php:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions/Collection/Collection.body.php:100352-107913
/branches/REL1_15/phase3/extensions/Collection/Collection.body.php:51646
/branches/REL1_17/phase3/extensions/Collection/Collection.body.php:81445,81448
/branches/new-installer/phase3/extensions/Collection/Collection.body.php:43664-66004
/branches/sqlite/extensions/Collection/Collection.body.php:58211-58321
/branches/wmf/1.18wmf1/extensions/Collection/Collection.body.php:97508
/trunk/extensions/Collection/Collection.body.php:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112613,112628,112739-112740,112744,112775,113988
/trunk/phase3/extensions/Collection/Collection.body.php:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
