diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-01 13:47:31 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-01 13:47:31 +0200 |
| commit | 81af5c95ed3610781c4e15287dd4cce0538e0de1 (patch) | |
| tree | af85673481c460afebac7189e5a4fccd02bec4a9 /phpBB/includes | |
| parent | 52c7193ad0ea30f990560594c8c2ada7fd2b696b (diff) | |
| parent | b83fa0349ad30eefed3e8064d29793a9b3dd17f7 (diff) | |
| download | forums-81af5c95ed3610781c4e15287dd4cce0538e0de1.tar forums-81af5c95ed3610781c4e15287dd4cce0538e0de1.tar.gz forums-81af5c95ed3610781c4e15287dd4cce0538e0de1.tar.bz2 forums-81af5c95ed3610781c4e15287dd4cce0538e0de1.tar.xz forums-81af5c95ed3610781c4e15287dd4cce0538e0de1.zip | |
Merge remote-tracking branch 'Senky/ticket/10847' into develop
* Senky/ticket/10847:
[ticket/10847] fixing all misspelled "dependant" to "dependent"
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index efb8b3ebd7..73eae4e967 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -1503,7 +1503,7 @@ class phpbb_db_tools $column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]]; } - // Adjust default value if db-dependant specified + // Adjust default value if db-dependent specified if (is_array($column_data[1])) { $column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default']; diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 9dc0634e5b..c402e15032 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -1933,7 +1933,7 @@ function utf8_wordwrap($string, $width = 75, $break = "\n", $cut = false) * UTF8-safe basename() function * * basename() has some limitations and is dependent on the locale setting -* according to the PHP manual. Therefore we provide our own locale independant +* according to the PHP manual. Therefore we provide our own locale independent * basename function. * * @param string $filename The filename basename() should be applied to |