bug 16611 -- broken regex made the MathCaptcha image not appear

Also, wrong parameter name for the answer made it not work. :)

diff --git a/MathCaptcha.class.php b/MathCaptcha.class.php
index 66567e03503495846d449beb17a4e463030ce78c..884a4b312f54070ac76a79b2dee21b18b34dfcf5 100644 (file)
--- a/MathCaptcha.class.php
+++ b/MathCaptcha.class.php
@@ -22,7 +22,7 @@ class MathCaptcha extends SimpleCaptcha {
                $index = $this->storeCaptcha( array( 'answer' => $answer ) );
                
                $form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
                $index = $this->storeCaptcha( array( 'answer' => $answer ) );
                
                $form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';

-               $form .= '<td>' . wfInput( 'wpCaptchaAnswer', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
+               $form .= '<td>' . wfInput( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';

                $form .= wfHidden( 'wpCaptchaId', $index );
                return $form;
        }
                $form .= wfHidden( 'wpCaptchaId', $index );
                return $form;
        }


@@ -42,7 +42,7 @@ class MathCaptcha extends SimpleCaptcha {
                $math = new MathRenderer( $sum );
                $math->setOutputMode( MW_MATH_PNG );
                $html = $math->render();
                $math = new MathRenderer( $sum );
                $math->setOutputMode( MW_MATH_PNG );
                $html = $math->render();

-               return preg_replace( '/alt=".*"/', '', $html );
+               return preg_replace( '/alt=".*?"/', '', $html );

        }
 
 }
        }
 
 }