r99986 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r99985‎ | r99986 | r99987 >
Date:22:22, 16 October 2011
Author:demon
Status:ok
Tags:
Comment:
MFT 99353
Modified paths:
  • /branches/wmf/1.18wmf1/skins/Standard.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/skins/Standard.php
——@@ -107,10 +107,10 @@
108108
109109 $barnumber = 1;
110110 foreach ( $bar as $browseLinks ) {
111 - if ( $barnumber > 1 ) {
112 - $s .= "\n<hr class='sep' />";
113 - }
114111 if ( is_array( $browseLinks ) ) {
 112+ if ( $barnumber > 1 ) {
 113+ $s .= "\n<hr class='sep' />";
 114+ }
115115 foreach ( $browseLinks as $link ) {
116116 if ( $link['text'] != '-' ) {
117117 $s .= "<a href=\"{$link['href']}\">" .
Property changes on: branches/wmf/1.18wmf1/skins/Standard.php
___________________________________________________________________
Added: svn:mergeinfo
118118 Merged /branches/sqlite/skins/Standard.php:r58211-58321
119119 Merged /trunk/phase3/skins/Standard.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,97810,98578,98598,98656,99353,99653,99694
120120 Merged /branches/new-installer/phase3/skins/Standard.php:r43664-66004
121121 Merged /branches/REL1_15/phase3/skins/Standard.php:r51646
122122 Merged /branches/REL1_17/phase3/skins/Standard.php:r81445,81448

Status & tagging log