Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7

weblate · weblate · commit d3af64d4ef19 · 2017-01-29T04:40:14.000+01:00
diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
@@ -280,6 +280,7 @@ public function tryQuery($query, $link = null, $options = 0,
                     'SQL[' . basename($_SERVER['SCRIPT_NAME']) . ']: '
                     . sprintf('%0.3f', $time) . ' > ' . $query
                 );
+                closelog();
             }
         }
 
diff --git a/libraries/Logging.php b/libraries/Logging.php
@@ -37,6 +37,7 @@ public static function logUser($user, $status = 'ok')
                 'user denied: ' . $user . ' (' . $status . ') from ' .
                 PMA_getIp()
             );
+            closelog();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ public function tryQuery($query, $link = null, $options = 0,`
`280`	`280`	`'SQL[' . basename($_SERVER['SCRIPT_NAME']) . ']: '`
`281`	`281`	`. sprintf('%0.3f', $time) . ' > ' . $query`
`282`	`282`	`);`
	`283`	`+ closelog();`
`283`	`284`	`}`
`284`	`285`	`}`
`285`	`286`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public static function logUser($user, $status = 'ok')`
`37`	`37`	`'user denied: ' . $user . ' (' . $status . ') from ' .`
`38`	`38`	`PMA_getIp()`
`39`	`39`	`);`
	`40`	`+ closelog();`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`	`}`