Merge branch '3.0'

* 3.0: fix: avoid nested forms, closes #1671 chore: bumped version to 3.0.2
thorsten · Mar 19, 2020 · 31469dc · 31469dc
2 parents 6f817db + 2a1d338
commit 31469dc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,9 @@ Version 3.1.0-dev
 - added support for Elasticsearch v6+ (Thorsten)
 - removed REST API v1 (Thorsten)
 
+Version 3.0.2
+-
+
 Version 3.0.1 - 2020-03-17
 - re-added tag cloud on several pages (Thorsten)
 - fixed minor bugs (Thorsten)

diff --git a/phpmyfaq/admin/record.edit.php b/phpmyfaq/admin/record.edit.php
@@ -264,14 +264,6 @@
 
     <?php } ?>
 
-    <form id="faqEditor" action="?action=<?= $queryString ?>" method="post" style="width: 100%;">
-        <input type="hidden" name="revision_id" id="revision_id" value="<?= $faqData['revision_id'] ?>">
-        <input type="hidden" name="record_id" id="record_id" value="<?= $faqData['id'] ?>">
-        <input type="hidden" name="csrf" id="csrf" value="<?= $user->getCsrfTokenFromSession() ?>">
-        <input type="hidden" name="openQuestionId" id="openQuestionId" value="<?= $questionId ?>">
-        <input type="hidden" name="notifyUser" id="notifyUser" value="<?= $notifyUser ?>">
-        <input type="hidden" name="notifyEmail" id="notifyEmail" value="<?= $notifyEmail ?>">
-
         <div class="row">
             <div class="col-lg-9">
                 <div class="card shadow mb-4">
@@ -309,9 +301,8 @@
                                     if (count($revisions)) { ?>
                                         <div class="form-group">
                                             <form id="selectRevision" name="selectRevision" method="post"
-                                                  accept-charset="utf-8"
                                                   action="?action=editentry&amp;id=<?= $faqData['id'] ?>&amp;lang=<?= $faqData['lang'] ?>">
-                                                <select name="revisionid_selected" onchange="selectRevision.submit();"
+                                                <select name="revisionid_selected" onchange="this.form.submit();"
                                                         class="form-control">
                                                     <option value="<?= $faqData['revision_id'] ?>">
                                                         <?= $PMF_LANG['ad_changerev'] ?>
@@ -347,6 +338,14 @@ class="form-control">
                                     }
                                 } ?>
 
+                              <form id="faqEditor" action="?action=<?= $queryString ?>" method="post" style="width: 100%;">
+                                <input type="hidden" name="revision_id" id="revision_id" value="<?= $faqData['revision_id'] ?>">
+                                <input type="hidden" name="record_id" id="record_id" value="<?= $faqData['id'] ?>">
+                                <input type="hidden" name="csrf" id="csrf" value="<?= $user->getCsrfTokenFromSession() ?>">
+                                <input type="hidden" name="openQuestionId" id="openQuestionId" value="<?= $questionId ?>">
+                                <input type="hidden" name="notifyUser" id="notifyUser" value="<?= $notifyUser ?>">
+                                <input type="hidden" name="notifyEmail" id="notifyEmail" value="<?= $notifyEmail ?>">
+
                                 <!-- Question -->
                                 <div class="form-group">
                                     <input type="text" name="question" id="question"

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 if [ "x${PMF_VERSION}" = "x" ]; then
-    PMF_VERSION="3.0.1"
+    PMF_VERSION="3.0.2"
 fi