| Index: branches/REL1_18/extensions/CentralAuth/specials/SpecialCentralAuth.php |
| — | — | @@ -464,7 +464,7 @@ |
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | |
| 468 | | - $url = $wiki->getUrl( $title ); |
| | 468 | + $url = $wiki->getFullUrl( $title ); |
| 469 | 469 | if ( $params ) |
| 470 | 470 | $url .= '?' . $params; |
| 471 | 471 | return Xml::element( 'a', |
| Property changes on: branches/REL1_18/extensions/CentralAuth |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 472 | 472 | Merged /trunk/extensions/CentralAuth:r104337,104360 |
| Index: branches/REL1_18/extensions/SecurePoll/includes/entities/Election.php |
| — | — | @@ -192,7 +192,7 @@ |
| 193 | 193 | $notCentrallyBlocked = $this->getProperty( 'not-centrally-blocked' ); |
| 194 | 194 | $centralBlockCount = isset( $props['central-block-count'] ) ? $props['central-block-count'] : 0; |
| 195 | 195 | $centralBlockThreshold = $this->getProperty( 'central-block-threshold', 1 ); |
| 196 | | - if ( $centralBlockCount >= $centralBlockThreshold ) { |
| | 196 | + if ( $notCentrallyBlocked && $centralBlockCount >= $centralBlockThreshold ) { |
| 197 | 197 | $status->fatal( 'securepoll-blocked-centrally', $wgLang->formatNum( $centralBlockThreshold ) ); |
| 198 | 198 | } |
| 199 | 199 | |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 200 | 200 | Merged /trunk/extensions:r104337,104360 |