diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:06:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:06:58 +0100 |
| commit | 7027489c8ebbd1f3a77a6357db8dc6e862cd978d (patch) | |
| tree | 8ddb2cc23a6b8ded7116716cb9552d97d868b1ad /phpBB | |
| parent | 12721f654e1503ddcf78dd1f0066516bdd08f989 (diff) | |
| parent | 36e96bbc6a540e0910e2881c4ba3a629b0e00d9b (diff) | |
| download | forums-7027489c8ebbd1f3a77a6357db8dc6e862cd978d.tar forums-7027489c8ebbd1f3a77a6357db8dc6e862cd978d.tar.gz forums-7027489c8ebbd1f3a77a6357db8dc6e862cd978d.tar.bz2 forums-7027489c8ebbd1f3a77a6357db8dc6e862cd978d.tar.xz forums-7027489c8ebbd1f3a77a6357db8dc6e862cd978d.zip | |
Merge branch 'ticket/p/10059' into develop-olympus
* ticket/p/10059:
[ticket/10059] Fix two misspellings of consistent.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 7434fa4870..bce65335d6 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1018,7 +1018,7 @@ append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp; <h4>General function usage: </h4> - <p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistant over the code.</p> + <p>Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistent over the code.</p> <ul> <li> diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 2dd58584f4..9fe0c8aed5 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1882,7 +1882,7 @@ class install_install extends module if (!$user_id) { - // If we can't insert this user then continue to the next one to avoid inconsistant data + // If we can't insert this user then continue to the next one to avoid inconsistent data $this->p_master->db_error('Unable to insert bot into users table', $db->sql_error_sql, __LINE__, __FILE__, true); continue; } |