Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

ChangeLog

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.7.0.0 (not yet released)
 - issue #11924 Remove caching of server information
+- issue #6146  Log authentication attempts to syslog
 
 4.6.0.0 (not yet released)
 + issue #11456 Disabled storage engines
@@ -81,6 +82,7 @@ phpMyAdmin - ChangeLog
 - issue #11964 Undefined index: TABLE_COMMENT in database structure page
 - issue #11967 Fix PHP error on loading invalid XML or ODS file
 - issue #11969 Missing confirmation while dropping a view in view_operations.php
+- issue #11968 Fix export of index comments in SQL
 
 4.5.4.1 (2016-01-29)
 - issue #11892 Error with PMA 4.4.15.3
@@ -126,7 +128,6 @@ phpMyAdmin - ChangeLog
 
 4.3.14.0 (not yet released)
 
-
          --- Older ChangeLogs can be found on our project website ---
                      http://www.phpmyadmin.net/old-stuff/ChangeLogs/
 

js/navigation.js

@@ -541,9 +541,6 @@ $(function () {
             }
         });
     });
-});
-
-AJAX.registerOnload('navigation.js', function () {
     // Check if session storage is supported
     if (isStorageSupported('sessionStorage')) {
         var storage = window.sessionStorage;
@@ -564,11 +561,6 @@ AJAX.registerOnload('navigation.js', function () {
         }
     }
 });
-AJAX.registerTeardown('navigation.js', function () {
-    if (isStorageSupported('sessionStorage')) {
-        $(document).off('submit', 'form.config-form');
-    }
-});
 
 /**
  * Expands a node in navigation tree.

libraries/logging.lib.php

@@ -22,5 +22,11 @@ function PMA_logUser($user, $status = 'ok')
         apache_note('userID', $user);
         apache_note('userStatus', $status);
     }
+    if (function_exists('syslog')) {
+        @syslog(
+            LOG_AUTHPRIV,
+            'phpMyAdmin: ' . $user . ' (' . $status . ') from ' . $_SERVER['REMOTE_ADDR']
+        );
+    }
 }
 

libraries/plugins/export/ExportSql.php

@@ -1632,7 +1632,9 @@ class ExportSql extends ExportPlugin
                             unset($statement->fields[$key]);
                         } else {
                             if (empty($GLOBALS['sql_if_not_exists'])) {
-                                $indexes[] = $field->build($field);
+                                $indexes[] = str_replace(
+                                    'COMMENT=\'', 'COMMENT \'', $field::build($field)
+                                );
                                 unset($statement->fields[$key]);
                             }
                         }

po/cs.po

@@ -6,10 +6,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-01-31 11:31+0000\n"
+"PO-Revision-Date: 2016-02-16 10:08+0000\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Czech <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"cs/>\n"
+"Language-Team: Czech "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -10404,8 +10404,8 @@ msgid ""
 "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
 "0x616263)</i>"
 msgstr ""
-"Vypisovat binární pole šestnáctkově <i>(například, „abc“ becomes 0x616263)</"
-"i>"
+"Vypisovat binární pole šestnáctkově <i>(například vypíše 0x616263 místo "
+"„abc“)</i>"
 
 #: libraries/plugins/export/ExportSql.php:447
 msgid ""