The branch, master has been updated via 381b593e5997899184e1fc7f3522f4d83bd5f025 (commit) via 3ab9bdf5e371dd4b5f11545da64619da22701229 (commit) via c289045dcde84ccad43b6ce6641edf36b3fc6c3a (commit) from e479f1c8431eb3a1b138d7812a1ab0f6d1020188 (commit) - Log ----------------------------------------------------------------- commit 381b593e5997899184e1fc7f3522f4d83bd5f025 Author: Michal Čihař <mcihar@suse.cz> Date: Fri Aug 19 10:52:32 2011 +0200 Fix typecasting commit 3ab9bdf5e371dd4b5f11545da64619da22701229 Author: Michal Čihař <mcihar@suse.cz> Date: Fri Aug 19 10:52:09 2011 +0200 Remove stray code commit c289045dcde84ccad43b6ce6641edf36b3fc6c3a Author: Michal Čihař <mcihar@suse.cz> Date: Fri Aug 19 10:49:58 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: libraries/js_escape.lib.php | 5 +++-- test/libraries/js_escape_test.php | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 85b62e1..87d8855 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -70,8 +70,9 @@ function PMA_formatJsVal($value) return 'true'; } else { return 'false'; - } else if (is_int($value)) { - return int($value); + } + } elseif (is_int($value)) { + return (int)$value; } else { return '"' . PMA_escapeJsString($value) . '"'; } diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index d29fcff..41d96d3 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -18,7 +18,6 @@ class PMA_File_test extends PHPUnit_Framework_TestCase */ public function testFormat($key, $value, $expected) { - $arr = new PMA_File($file); $this->assertEquals($expected, PMA_getJsValue($key, $value)); } hooks/post-receive -- phpMyAdmin