diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 74efd27e82..dd3b301e0a 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -1929,8 +1929,8 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table) list($list_of_privileges, $list_of_compared_privileges) = PMA_getListOfPrivilegesAndComparedPrivileges(); - $sql_query = - "(" + $sql_query + = "(" . " SELECT " . $list_of_privileges . ", '*' AS `Db`" . " FROM `mysql`.`user`" . " WHERE NOT (" . $list_of_compared_privileges . ")" diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php index 105cd2f19f..7491fd6db2 100644 --- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php +++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php @@ -215,8 +215,8 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase $this->object->exportHeader(); $result = ob_get_clean(); - $expected = - '