diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-12 09:05:02 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-12 09:05:02 -0700 |
| commit | 7e4acced8599e7275e20ebab10bdc925ece4baee (patch) | |
| tree | 32c15555b04bcc68a8324d973696ca7114da5ff7 /phpBB | |
| parent | 25c37bcee7b017828a0ff69bc64b6bf47d9e46d5 (diff) | |
| parent | 658b378b6375aec3df9a4f4a576428ba817cdda8 (diff) | |
| download | forums-7e4acced8599e7275e20ebab10bdc925ece4baee.tar forums-7e4acced8599e7275e20ebab10bdc925ece4baee.tar.gz forums-7e4acced8599e7275e20ebab10bdc925ece4baee.tar.bz2 forums-7e4acced8599e7275e20ebab10bdc925ece4baee.tar.xz forums-7e4acced8599e7275e20ebab10bdc925ece4baee.zip | |
Merge pull request #1526 from bantu/ticket/11662-develop
[ticket/11662] Typos: occured -> occurred
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/migration/migration.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_postgres.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/migrator.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php index 5f14a6953c..0ffa96fd14 100644 --- a/phpBB/includes/db/migration/migration.php +++ b/phpBB/includes/db/migration/migration.php @@ -44,7 +44,7 @@ abstract class phpbb_db_migration /** @var string */ protected $php_ext; - /** @var array Errors, if any occured */ + /** @var array Errors, if any occurred */ protected $errors; /** @var array List of queries executed through $this->sql_query() */ diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index aa493c3281..b16a7df606 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -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 * - * @return string|bool Language key of the error/incompatiblity occured + * @return string|bool Language key of the error/incompatiblity occurred */ public function init() { diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php index 496a29f5a3..758c3ba061 100644 --- a/phpBB/includes/search/fulltext_postgres.php +++ b/phpBB/includes/search/fulltext_postgres.php @@ -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 * - * @return string|bool Language key of the error/incompatiblity occured + * @return string|bool Language key of the error/incompatiblity occurred */ public function init() { diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index f94c27be8c..34dcbf4c52 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -45,7 +45,7 @@ $lang = array_merge($lang, array( 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$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_NOT_EXIST' => 'A required module does not exist: %s', |