| Index: branches/wmf/1.19wmf1/includes/specials/SpecialUserlogin.php |
| — | — | @@ -797,7 +797,7 @@ |
| 798 | 798 | function resetLoginForm( $error ) { |
| 799 | 799 | $this->getOutput()->addHTML( Xml::element('p', array( 'class' => 'error' ), $error ) ); |
| 800 | 800 | $reset = new SpecialChangePassword(); |
| 801 | | - $reset->setContext( $this ); |
| | 801 | + $reset->setContext( $this->getContext() ); |
| 802 | 802 | $reset->execute( null ); |
| 803 | 803 | } |
| 804 | 804 | |
| Property changes on: branches/wmf/1.19wmf1/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 805 | 805 | Merged /trunk/phase3/includes/specials:r113099 |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 806 | 806 | Merged /trunk/phase3/includes:r113099 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 807 | 807 | Merged /trunk/phase3:r113039,113099 |