| Index: branches/wmf/1.18wmf1/extensions/CentralNotice/special/SpecialBannerAllocation.php |
| — | — | @@ -178,11 +178,11 @@ |
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | | - if ( $anonBanners ) { |
| | 182 | + if ( $anonBanners && $anonWeight > 0 ) { |
| 183 | 183 | $htmlOut .= $this->getTable( wfMsg ( 'centralnotice-banner-anonymous' ), $anonBanners, $anonWeight ); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | | - if ( $accountBanners ) { |
| | 186 | + if ( $accountBanners && $accountWeight > 0 ) { |
| 187 | 187 | $htmlOut .= $this->getTable( wfMsg ( 'centralnotice-banner-logged-in' ), $accountBanners, $accountWeight ); |
| 188 | 188 | } |
| 189 | 189 | } else { |
| — | — | @@ -203,7 +203,7 @@ |
| 204 | 204 | $viewCampaign = $this->getTitleFor( 'CentralNotice' ); |
| 205 | 205 | |
| 206 | 206 | $htmlOut = Html::openElement( 'table', |
| 207 | | - array ( 'cellpadding' => 9, 'class' => 'wikitable sortable', 'style' => 'margin: 1em;' ) |
| | 207 | + array ( 'cellpadding' => 9, 'class' => 'wikitable sortable', 'style' => 'margin: 1em 0;' ) |
| 208 | 208 | ); |
| 209 | 209 | $htmlOut .= Html::element( 'caption', array( 'style' => 'font-size: 1.2em;' ), $type ); |
| 210 | 210 | $htmlOut .= Html::openElement( 'tr' ); |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralNotice/special/SpecialBannerAllocation.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 211 | 211 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerAllocation.php:r104223 |
| Index: branches/wmf/1.18wmf1/extensions/CentralNotice/CentralNotice.db.php |
| — | — | @@ -456,7 +456,7 @@ |
| 457 | 457 | 'CR'=>'Costa Rica', |
| 458 | 458 | 'CI'=>'Côte d\'Ivoire', |
| 459 | 459 | 'HR'=>'Croatia', |
| 460 | | - 'CU'=>'Cuba', |
| | 460 | + //'CU'=>'Cuba', |
| 461 | 461 | 'CY'=>'Cyprus', |
| 462 | 462 | 'CZ'=>'Czech Republic', |
| 463 | 463 | 'DK'=>'Denmark', |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | 'IS'=>'Iceland', |
| 504 | 504 | 'IN'=>'India', |
| 505 | 505 | 'ID'=>'Indonesia', |
| 506 | | - 'IR'=>'Iran', |
| | 506 | + //'IR'=>'Iran', |
| 507 | 507 | 'IQ'=>'Iraq', |
| 508 | 508 | 'IE'=>'Ireland', |
| 509 | 509 | 'IL'=>'Israel', |
| — | — | @@ -610,7 +610,7 @@ |
| 611 | 611 | 'SZ'=>'Swaziland', |
| 612 | 612 | 'SE'=>'Sweden', |
| 613 | 613 | 'CH'=>'Switzerland', |
| 614 | | - 'SY'=>'Syrian Arab Republic', |
| | 614 | + //'SY'=>'Syrian Arab Republic', |
| 615 | 615 | 'TW'=>'Taiwan', |
| 616 | 616 | 'TJ'=>'Tajikistan', |
| 617 | 617 | 'TZ'=>'Tanzania', |
| Property changes on: branches/wmf/1.18wmf1/extensions/CentralNotice/CentralNotice.db.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 618 | 618 | Merged /trunk/extensions/CentralNotice/CentralNotice.db.php:r105147 |