Commit:    c1e19f4fdeb29dbf0814513553099a0d2cf6e0d1
Author:    Daniel Convissor <[email protected]>         Sat, 4 
Jan 2014 21:33:55 -0500
Parents:   861c7583817c8e79879baaa018ad9397a86eda93
Branches:  master

Link:       
http://git.php.net/?p=web/bugs.git;a=commitdiff;h=c1e19f4fdeb29dbf0814513553099a0d2cf6e0d1

Log:
Move to right place: clarify captcha needs to be redone before resubmitting 
after the "Are you sure that you searched" question (Bug #66393)

Bugs:
https://bugs.php.net/66393

Changed paths:
  M  www/bug.php
  M  www/report.php


Diff:
diff --git a/www/bug.php b/www/bug.php
index 183b354..5d78183 100644
--- a/www/bug.php
+++ b/www/bug.php
@@ -1007,14 +1007,7 @@ if (!$logged_in) {
                        </td>
                </tr>
                <tr>
-<?php
-if (!empty($_POST['captcha']) && empty($ok_to_submit_report)) {
-       $captcha_label = '<strong>Solve this <em>new</em> problem:</strong>';
-} else {
-       $captcha_label = 'Solve the problem:';
-}
-?>
-                       <th><?php echo $captcha_label; ?><br /><?php echo 
htmlspecialchars($captcha); ?> = ?</th>
+                       <th>Solve the problem:<br /><?php echo 
htmlspecialchars($captcha); ?> = ?</th>
                        <td class="form-input"><input type="text" 
name="captcha" /></td>
                </tr>
                <tr>
diff --git a/www/report.php b/www/report.php
index 4bb0218..b4f2747 100644
--- a/www/report.php
+++ b/www/report.php
@@ -531,9 +531,14 @@ display_bug_error($errors);
 <?php if (!$logged_in) { 
        $captcha = $numeralCaptcha->getOperation();
        $_SESSION['answer'] = $numeralCaptcha->getAnswer();
+       if (!empty($_POST['captcha']) && empty($ok_to_submit_report)) {
+               $captcha_label = '<strong>Solve this <em>new</em> 
problem:</strong>';
+       } else {
+               $captcha_label = 'Solve the problem:';
+       }
 ?>
                        <tr>
-                               <th>Solve the problem:<br /><?php echo 
$captcha; ?> = ?</th>
+                               <th><?php echo $captcha_label; ?><br /><?php 
echo htmlspecialchars($captcha); ?> = ?</th>
                                <td class="form-input"><input type="text" 
name="captcha" autocomplete="off"/></td>
                        </tr>
 <?php } ?>


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to