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

Merge branch 'develop' into feature/request-class

Browse Source 
* develop: (157 commits)
  [ticket/10316] Resolve inconsistent move topic behavior
  [ticket/9297] Add network to class name of unit tests.
  [ticket/9297] Fix typo in localhost.
  [ticket/9297] Rename test class to reflect its contents.
  [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
  [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
  [ticket/9608] Remove use of references in topic_review
  [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
  [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
  [ticket/9297] Update copyright year of unit test file.
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [ticket/9297] Make EPSV unit tests work without IPv6.
  [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
  [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
  [ticket/10312] Un-check the shadow option while moving.
  [feature/template-engine] Need to call set_template on template.
  [feature/template-engine] Update installer for template engine changes.
  [feature/template-engine] Dependency inject locator into template.
  [feature/template-engine] Delete useless code from set_template.
  ...

Conflicts:
	phpBB/includes/functions.php
This commit is contained in:
Igor Wiedler
2011-08-18 22:31:25 +02:00
parent f84460c710 9589fbffe4
commit 38c65da553
130 changed files with 3557 additions and 2372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View File

@@ -50,9 +50,9 @@ class phpbb_captcha_gd extends phpbb_default_captcha
}
}
function &get_instance()
function get_instance()
{
$instance =& new phpbb_captcha_gd();
$instance = new phpbb_captcha_gd();
return $instance;
}

4
phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
View File

@@ -40,9 +40,9 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
}
}
function &get_instance()
function get_instance()
{
$instance =& new phpbb_captcha_nogd();
$instance = new phpbb_captcha_nogd();
return $instance;
}

4
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
View File

@@ -99,9 +99,9 @@ class phpbb_captcha_qa
/**
* API function
*/
function &get_instance()
function get_instance()
{
$instance =& new phpbb_captcha_qa();
$instance = new phpbb_captcha_qa();
return $instance;
}

4
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View File

@@ -55,9 +55,9 @@ class phpbb_recaptcha extends phpbb_default_captcha
$this->response = request_var('recaptcha_response_field', '');
}
function &get_instance()
function get_instance()
{
$instance =& new phpbb_recaptcha();
$instance = new phpbb_recaptcha();
return $instance;
}