| Index: branches/REL1_18/phase3/skins/Standard.php |
| — | — | @@ -109,11 +109,13 @@ |
| 110 | 110 | foreach ( $bar as $browseLinks ) { |
| 111 | 111 | if ( $barnumber > 1 ) { |
| 112 | 112 | $s .= "\n<hr class='sep' />"; |
| 113 | | - } |
| 114 | | - foreach ( $browseLinks as $link ) { |
| 115 | | - if ( $link['text'] != '-' ) { |
| 116 | | - $s .= "<a href=\"{$link['href']}\">" . |
| 117 | | - htmlspecialchars( $link['text'] ) . '</a>' . $sep; |
| | 113 | + } |
| | 114 | + if ( is_array( $browseLinks ) ) { |
| | 115 | + foreach ( $browseLinks as $link ) { |
| | 116 | + if ( $link['text'] != '-' ) { |
| | 117 | + $s .= "<a href=\"{$link['href']}\">" . |
| | 118 | + htmlspecialchars( $link['text'] ) . '</a>' . $sep; |
| | 119 | + } |
| 118 | 120 | } |
| 119 | 121 | } |
| 120 | 122 | if ( $barnumber == 1 ) { |
| Index: branches/REL1_18/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -295,7 +295,7 @@ |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) { |
| 299 | | - $vals['parsedcomment'] = $this->getSkin()->formatComment( $row->rc_comment, $title ); |
| | 299 | + $vals['parsedcomment'] = Linker::formatComment( $row->rc_comment, $title ); |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | if ( $this->fld_loginfo && $row->rc_type == RC_LOG ) { |
| Property changes on: branches/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 303 | 303 | Merged /branches/wmf/1.18wmf1/includes/api:r98962,98971,99004,99065 |
| Property changes on: branches/REL1_18/phase3/includes/cache/MessageCache.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 304 | 304 | Merged /branches/wmf/1.18wmf1/includes/cache/MessageCache.php:r99065 |
| Index: branches/REL1_18/phase3/includes/specials/SpecialEmailuser.php |
| — | — | @@ -122,7 +122,7 @@ |
| 123 | 123 | if( !$ret instanceof User ) { |
| 124 | 124 | if( $this->mTarget != '' ) { |
| 125 | 125 | $ret = ( $ret == 'notarget' ) ? 'emailnotarget' : ( $ret . 'text' ); |
| 126 | | - $out->wrapWikiMsg( "<p class='error'>$1</p>", $ret ); |
| | 126 | + $wgOut->wrapWikiMsg( "<p class='error'>$1</p>", $ret ); |
| 127 | 127 | } |
| 128 | 128 | $wgOut->addHTML( self::userForm( $this->mTarget ) ); |
| 129 | 129 | return false; |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 130 | 130 | Merged /branches/wmf/1.18wmf1/includes/specials:r99004,99065 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 131 | 131 | Merged /branches/wmf/1.18wmf1/includes:r98962,98971,99004,99065 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 132 | 132 | Merged /branches/wmf/1.18wmf1:r98962,98971,99004,99065 |