| Index: branches/wmf/1.17wmf1/includes/specials/SpecialEmailuser.php |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | $this->outputHeader(); |
| 92 | 92 | |
| 93 | 93 | $this->mTarget = is_null( $par ) |
| 94 | | - ? $wgRequest->getVal( 'wpTarget', '' ) |
| | 94 | + ? $wgRequest->getVal( 'wpTarget', $wgRequest->getVal( 'target', '' ) ) |
| 95 | 95 | : $par; |
| 96 | 96 | |
| 97 | 97 | $ret = self::getTarget( $this->mTarget ); |
| Property changes on: branches/wmf/1.17wmf1/includes/specials/SpecialEmailuser.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 98 | 98 | Merged /branches/wmf-deployment/includes/specials/SpecialEmailuser.php:r53381,56967,60970 |
| 99 | 99 | Merged /branches/REL1_15/phase3/includes/specials/SpecialEmailuser.php:r51646 |
| 100 | 100 | Merged /branches/wmf/1.16wmf4/includes/specials/SpecialEmailuser.php:r67177,69199,76243,77266 |
| 101 | 101 | Merged /branches/sqlite/includes/specials/SpecialEmailuser.php:r58211-58321 |
| 102 | 102 | Merged /trunk/phase3/includes/specials/SpecialEmailuser.php:r82392,85099 |