diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:08:29 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-06 15:08:29 +0100 |
| commit | 239cb56af09424825f6a83dea42dc3cb10d9a470 (patch) | |
| tree | c51e2073c99d5085e14a92be4fddd3f755b1fc23 /phpBB | |
| parent | e8def259ef26477e1f7ae2b338eac34142572458 (diff) | |
| parent | 7027489c8ebbd1f3a77a6357db8dc6e862cd978d (diff) | |
| download | forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.gz forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.bz2 forums-239cb56af09424825f6a83dea42dc3cb10d9a470.tar.xz forums-239cb56af09424825f6a83dea42dc3cb10d9a470.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9824] Accept commit messages with less than perfect headings.
[ticket/9824] Allow empty lines after ticket reference.
[ticket/9824] Use printf instead of echo to render \n.
[ticket/9824] Handle empty commit messages in commit-msg hook.
[ticket/10059] Fix two misspellings of consistent.
[ticket/9824] Add space after [ticket/12345] in prepared commit message.
[ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
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 83985fe9d7..ef4d6b13a1 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1097,7 +1097,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 01ed223c27..e18ed43778 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1867,7 +1867,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; } |