diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index ff0a63414f..6b26f5dd30 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1260,7 +1260,6 @@ function PMA_RTN_getQueryFromRequest() ) ) { if (! $warned_about_length) { - $warned_about_length = true; $errors[] = __( 'You must provide length/values for routine parameters' . ' of type ENUM, SET, VARCHAR and VARBINARY.' diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index 62f8485139..e0b451c341 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -232,15 +232,14 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest * @param string $line_color color for the GIS MULTILINESTRING object * @param array $scale_data array containing data related to scaling * @param object $image image object - * @param string $output expected output * * @return void * @dataProvider providerForPrepareRowAsPng */ public function testPrepareRowAsPng( - $spatial, $label, $line_color, $scale_data, $image, $output + $spatial, $label, $line_color, $scale_data, $image ) { - $return = $this->object->prepareRowAsPng( + $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); /* TODO: this never fails */ @@ -265,8 +264,7 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest 'scale' => 2, 'height' => 150 ), - imagecreatetruecolor('120', '150'), - '' + imagecreatetruecolor('120', '150') ) ); }