'same' and 'new' are the only choices here

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Define $message in all paths

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Define $sql_query in all paths

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Fix bad line breaks

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Avoid bad line breaks

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin