makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1526 from bantu/ticket/11662-develop

Browse source 
[ticket/11662] Typos: occured -> occurred
This commit is contained in:
Nathan Guse 2013-07-12 09:05:02 -07:00
commit 7e4acced85
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/db/migration/migration.php
View file

@ -44,7 +44,7 @@ abstract class phpbb_db_migration
/** @var string */ /** @var string */
protected $php_ext; protected $php_ext;
/** @var array Errors, if any occured */ /** @var array Errors, if any occurred */
protected $errors; protected $errors;
/** @var array List of queries executed through $this->sql_query() */ /** @var array List of queries executed through $this->sql_query() */

2
phpBB/includes/search/fulltext_mysql.php
View file

@ -140,7 +140,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
/** /**
* Checks for correct MySQL version and stores min/max word length in the config * Checks for correct MySQL version and stores min/max word length in the config
* *
* @return string|bool Language key of the error/incompatiblity occured * @return string|bool Language key of the error/incompatiblity occurred
*/ */
public function init() public function init()
{ {

2
phpBB/includes/search/fulltext_postgres.php
View file

@ -185,7 +185,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
/** /**
* Checks for correct PostgreSQL version and stores min/max word length in the config * Checks for correct PostgreSQL version and stores min/max word length in the config
* *
* @return string|bool Language key of the error/incompatiblity occured * @return string|bool Language key of the error/incompatiblity occurred
*/ */
public function init() public function init()
{ {

2
phpBB/language/en/migrator.php
View file

@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".',
'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %s', 'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %s',
'MODULE_ERROR' => 'An error occured while creating a module: %s', 'MODULE_ERROR' => 'An error occurred while creating a module: %s',
'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s',
'MODULE_NOT_EXIST' => 'A required module does not exist: %s', 'MODULE_NOT_EXIST' => 'A required module does not exist: %s',

2
tests/template/template_test_case.php
View file

@ -33,7 +33,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
} }
catch (Exception $exception) catch (Exception $exception)
{ {
// reset output buffering even when an error occured // reset output buffering even when an error occurred
// PHPUnit turns trigger_error into exceptions as well // PHPUnit turns trigger_error into exceptions as well
ob_end_clean(); ob_end_clean();
throw $exception; throw $exception;