| Index: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php |
| — | — | @@ -835,14 +835,14 @@ |
| 836 | 836 | } elseif ( $item['type'] == 'article' ) { |
| 837 | 837 | if ( $item['currentVersion'] == 1 ) { |
| 838 | 838 | $articleText .= ":[[" . $item['title']; |
| 839 | | - if ( $item['displaytitle'] ) { |
| | 839 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 840 | 840 | $articleText .= "|" . $item['displaytitle']; |
| 841 | 841 | } |
| 842 | 842 | $articleText .= "]]\n"; |
| 843 | 843 | } else { |
| 844 | 844 | $articleText .= ":[{{fullurl:" . $item['title']; |
| 845 | 845 | $articleText .= "|oldid=" . $item['revision'] . "}} "; |
| 846 | | - if ( $item['displaytitle'] ) { |
| | 846 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 847 | 847 | $articleText .= $item['displaytitle']; |
| 848 | 848 | } else { |
| 849 | 849 | $articleText .= $item['title']; |
| Property changes on: branches/wmf/1.19wmf1/extensions/Collection/Collection.body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 850 | 850 | Merged /trunk/extensions/Collection/Collection.body.php:r113988 |
| Property changes on: branches/wmf/1.19wmf1/extensions/Collection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 851 | 851 | Merged /trunk/extensions/Collection:r113988 |
| Index: branches/REL1_18/extensions/Collection/Collection.body.php |
| — | — | @@ -831,14 +831,14 @@ |
| 832 | 832 | } elseif ( $item['type'] == 'article' ) { |
| 833 | 833 | if ( $item['currentVersion'] == 1 ) { |
| 834 | 834 | $articleText .= ":[[" . $item['title']; |
| 835 | | - if ( $item['displaytitle'] ) { |
| | 835 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 836 | 836 | $articleText .= "|" . $item['displaytitle']; |
| 837 | 837 | } |
| 838 | 838 | $articleText .= "]]\n"; |
| 839 | 839 | } else { |
| 840 | 840 | $articleText .= ":[{{fullurl:" . $item['title']; |
| 841 | 841 | $articleText .= "|oldid=" . $item['revision'] . "}} "; |
| 842 | | - if ( $item['displaytitle'] ) { |
| | 842 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 843 | 843 | $articleText .= $item['displaytitle']; |
| 844 | 844 | } else { |
| 845 | 845 | $articleText .= $item['title']; |
| Property changes on: branches/REL1_18/extensions/Collection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 846 | 846 | Merged /trunk/extensions/Collection:r113988 |
| Index: branches/REL1_19/extensions/Collection/Collection.body.php |
| — | — | @@ -831,14 +831,14 @@ |
| 832 | 832 | } elseif ( $item['type'] == 'article' ) { |
| 833 | 833 | if ( $item['currentVersion'] == 1 ) { |
| 834 | 834 | $articleText .= ":[[" . $item['title']; |
| 835 | | - if ( $item['displaytitle'] ) { |
| | 835 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 836 | 836 | $articleText .= "|" . $item['displaytitle']; |
| 837 | 837 | } |
| 838 | 838 | $articleText .= "]]\n"; |
| 839 | 839 | } else { |
| 840 | 840 | $articleText .= ":[{{fullurl:" . $item['title']; |
| 841 | 841 | $articleText .= "|oldid=" . $item['revision'] . "}} "; |
| 842 | | - if ( $item['displaytitle'] ) { |
| | 842 | + if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) { |
| 843 | 843 | $articleText .= $item['displaytitle']; |
| 844 | 844 | } else { |
| 845 | 845 | $articleText .= $item['title']; |
| Property changes on: branches/REL1_19/extensions/Collection |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 846 | 846 | Merged /trunk/extensions/Collection:r111011,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 |