From 658b378b6375aec3df9a4f4a576428ba817cdda8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 17:51:29 +0200
Subject: [PATCH] [ticket/11662] Typos: occured -> occurred

PHPBB3-11662
---
 phpBB/includes/db/migration/migration.php   | 2 +-
 phpBB/includes/search/fulltext_mysql.php    | 2 +-
 phpBB/includes/search/fulltext_postgres.php | 2 +-
 phpBB/language/en/migrator.php              | 2 +-
 tests/template/template_test_case.php       | 2 +-
 5 files changed, 5 insertions(+), 5 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',
 
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 4a7bf8d168..6d87e5ebc0 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -33,7 +33,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		}
 		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
 			ob_end_clean();
 			throw $exception;