Commit:    b820819a50ff1026cb1a3f4bad3a60fe0222515a
Author:    Sara Golemon <poll...@php.net>         Tue, 7 Aug 2018 17:29:10 -0400
Parents:   767a4aa768224fe6211cae946067a897af0fd9fd
Branches:  master

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

Log:
Merge password prompt explainations

Changed paths:
  M  www/bug.php


Diff:
diff --git a/www/bug.php b/www/bug.php
index 5ae7137..76ac0e1 100644
--- a/www/bug.php
+++ b/www/bug.php
@@ -768,38 +768,30 @@ if ($edit == 1 || $edit == 2) { ?>
 
 <form id="update" action="bug.php?id=<?php echo $bug_id; ?>&amp;edit=<?php 
echo $edit; ?>" method="post">
 
-<?php if ($edit == 2) {
-               if ($show_bug_info) { ?>
-                        <div class="explain">
-                                <table>
-                                        <tr>
-                                                <td class="details">Passw<span 
class="accesskey">o</span>rd:</td>
-                                                <td><input type="password" 
name="pw" value="<?php echo htmlspecialchars($pw); ?>" size="10" maxlength="20" 
accesskey="o"></td>
-                                        </tr>
-                                </table>
-                        </div>
-<?php  } else { ?>
-                       <div class="explain">
-                       <?php if (!isset($_POST['in'])) { ?>
-                               Welcome back! If you're the original bug 
submitter, here's
-                               where you can edit the bug or add additional 
notes.
-                <br>If this is not your bug, you can
-                <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a 
comment by following this link</a>.<br>
-                               If this is your bug, but you forgot your 
password, <a href="bug-pwd-finder.php?id=<?php echo $bug_id; ?>">you can 
retrieve your password here</a>.
-                <br>
-                       <?php } ?>
-
-                               <table>
-                                       <tr>
-                                               <td class="details">Passw<span 
class="accesskey">o</span>rd:</td>
-                                               <td><input type="password" 
name="pw" value="<?php echo htmlspecialchars($pw); ?>" size="10" maxlength="20" 
accesskey="o"></td>
-                                               <?php if (!$show_bug_info) { ?>
-                                               <input type="submit" 
value="Submit">
-                                               <?php } ?>
-                                       </tr>
-                               </table>
-                       </div>
-<?php  }
+<?php
+       if ($edit == 2) {
+?>
+               <div class="explain">
+               <?php if (!isset($_POST['in'])) { ?>
+                       Welcome back! If you're the original bug submitter, 
here's
+                       where you can edit the bug or add additional notes.
+               <br>If this is not your bug, you can
+               <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a 
comment by following this link</a>.<br>
+                       If this is your bug, but you forgot your password, <a 
href="bug-pwd-finder.php?id=<?php echo $bug_id; ?>">you can retrieve your 
password here</a>.
+               <br>
+               <?php } ?>
+
+                       <table>
+                               <tr>
+                                       <td class="details">Passw<span 
class="accesskey">o</span>rd:</td>
+                                       <td><input type="password" name="pw" 
value="<?php echo htmlspecialchars($pw); ?>" size="10" maxlength="20" 
accesskey="o"></td>
+                                       <?php if (!$show_bug_info) { ?>
+                                       <input type="submit" value="Submit">
+                                       <?php } ?>
+                               </tr>
+                       </table>
+               </div>
+<?php
        } else {
                if ($logged_in == 'developer') {
 ?>


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

Reply via email to