Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ticket/11469

* nickvergessen/ticket/bantu/11469:
  [ticket/11469] Use method to check config count, instead of repeating it
  [ticket/11469] Return after sql_multi_insert when multi_insert is false
  [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer

phpBB/includes/db/sql_insert_buffer.php

@@ -84,6 +84,7 @@ class phpbb_db_sql_insert_buffer
 			// Pass data on to sql_multi_insert right away which will
 			// immediately send an INSERT INTO query to the database.
 			$this->db->sql_multi_insert($this->table_name, array($row));
+			return;
 		}
 
 		$this->buffer[] = $row;