Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2015-12-16 11:37:54 +0300
committerMichal Čihař <michal@cihar.com>2015-12-16 11:44:27 +0300
commita2a321eaf798af93d48951960d60588224e76145 (patch)
tree580837121cb5be75eab7e7bb9797bc64d7069eeb /tbl_operations.php
parentc217eaffc27f4d3a81e52f2f13eff98ff6dbd9ae (diff)
No need to set type of message when we pass Message instance
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'tbl_operations.php')
-rw-r--r--tbl_operations.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/tbl_operations.php b/tbl_operations.php
index 305fd2e53e..66e36392c9 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -215,15 +215,10 @@ if ($reread_info) {
unset($reread_info);
if (isset($result) && empty($message_to_show)) {
- // set to success by default, because result set could be empty
- // (for example, a table rename)
- $_type = 'success';
if (empty($_message)) {
$_message = $result
? PMA\libraries\Message::success()
: PMA\libraries\Message::error();
- // $result should exist, regardless of $_message
- $_type = $result ? 'success' : 'error';
if (isset($GLOBALS['ajax_request'])
&& $GLOBALS['ajax_request'] == true
@@ -256,9 +251,9 @@ if (isset($result) && empty($message_to_show)) {
}
$response->addHTML(
- PMA\libraries\Util::getMessage($_message, $sql_query, $_type)
+ PMA\libraries\Util::getMessage($_message, $sql_query)
);
- unset($_message, $_type);
+ unset($_message);
}
$url_params['goto']