UPDATE to 4.2.10.1

3 files changed, 46 insertions, 7 deletions

diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 15c5414150..2470409d8c 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -244,12 +244,14 @@ class AuthenticationCookie extends AuthenticationPlugin
                         value="manual_challenge">
                  </noscript>
                  <script type="text/javascript">
-                    $("#recaptcha_reload_btn").addClass("disableAjax");
-                    $("#recaptcha_switch_audio_btn").addClass("disableAjax");
-                    $("#recaptcha_switch_img_btn").addClass("disableAjax");
-                    $("#recaptcha_whatsthis_btn").addClass("disableAjax");
-                    $("#recaptcha_audio_play_again").live("mouseover", function() {
-                        $(this).addClass("disableAjax");
+                    $(function() {
+                        $("#recaptcha_reload_btn").addClass("disableAjax");
+                        $("#recaptcha_switch_audio_btn").addClass("disableAjax");
+                        $("#recaptcha_switch_img_btn").addClass("disableAjax");
+                        $("#recaptcha_whatsthis_btn").addClass("disableAjax");
+                        $("#recaptcha_audio_play_again").live("mouseover", function() {
+                            $(this).addClass("disableAjax");
+                        });
                     });
                  </script>';
         }
diff --git a/libraries/plugins/export/ExportPdf.class.php b/libraries/plugins/export/ExportPdf.class.php
index 876f0700bb..5efc704681 100644
--- a/libraries/plugins/export/ExportPdf.class.php
+++ b/libraries/plugins/export/ExportPdf.class.php
@@ -63,7 +63,9 @@ class ExportPdf extends ExportPlugin
      */
     protected function initSpecificVariables()
     {
-        $this->_setPdfReportTitle("");
+        if (! empty($_POST['pdf_report_title'])) {
+            $this->_setPdfReportTitle($_POST['pdf_report_title']);
+        }
         $this->_setPdf(new PMA_ExportPdf('L', 'pt', 'A3'));
     }
 
diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php
index 713d86ed15..84c98b3be2 100644
--- a/libraries/plugins/export/ExportXml.class.php
+++ b/libraries/plugins/export/ExportXml.class.php
@@ -103,6 +103,10 @@ class ExportXml extends ExportPlugin
         // create primary items and add them to the group
         if (! PMA_DRIZZLE) {
             $leaf = new BoolPropertyItem();
+            $leaf->setName("export_events");
+            $leaf->setText(__('Events'));
+            $structure->addProperty($leaf);
+            $leaf = new BoolPropertyItem();
             $leaf->setName("export_functions");
             $leaf->setText(__('Functions'));
             $structure->addProperty($leaf);
@@ -355,6 +359,37 @@ class ExportXml extends ExportPlugin
                 }
             }
 
+            if (isset($GLOBALS['xml_export_events'])
+                && $GLOBALS['xml_export_events']
+            ) {
+                if (PMA_MYSQL_INT_VERSION > 50100) {
+                    // Export events
+                    $events = $GLOBALS['dbi']->fetchResult(
+                        "SELECT EVENT_NAME FROM information_schema.EVENTS "
+                        . "WHERE EVENT_SCHEMA='" . PMA_Util::sqlAddslashes($db) . "'"
+                    );
+                    if ($events) {
+                        foreach ($events as $event) {
+                            $head .= '            <pma:event name="'
+                                . $event . '">' . $crlf;
+
+                            $sql = $GLOBALS['dbi']->getDefinition(
+                                $db, 'EVENT', $event
+                            );
+                            $sql = rtrim($sql);
+                            $sql = "                " . htmlspecialchars($sql);
+                            $sql = str_replace("\n", "\n                ", $sql);
+
+                            $head .= $sql . $crlf;
+                            $head .= '            </pma:event>' . $crlf;
+                        }
+
+                        unset($event);
+                        unset($events);
+                    }
+                }
+            }
+
             unset($result);
 
             $head .= '        </pma:database>' . $crlf;