mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD

Browse Source 
* github-phpbb/develop-olympus:
  [ticket/11159] static public is the currently approved order.

Conflicts:
	tests/dbal/select_test.php
	tests/dbal/write_test.php
	tests/request/request_var_test.php
	tests/security/extract_current_page_test.php
	tests/security/redirect_test.php
	tests/template/template_test.php
	tests/text_processing/make_clickable_test.php
	tests/utf/utf8_clean_string_test.php
This commit is contained in:
Nils Adermann
2012-11-06 20:02:40 +01:00
parent f941a5cc2d 875adc4247
commit 1d388d98ab
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/dbal/select_test.php
View File

@@ -125,7 +125,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $ary);
}
public static function fetchfield_seek_data()
static public function fetchfield_seek_data()
{
return array(
array(1, 'foobar'),
@@ -151,7 +151,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $field);
}
public static function query_limit_data()
static public function query_limit_data()
{
return array(
array(0, 0, array(array('username_clean' => 'barfoo'),