diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 13:36:41 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 13:36:41 -0700 |
| commit | 84e35fb2e0fcd7400d289e06395c975fc7a77816 (patch) | |
| tree | 7a40baf0694a4d6d7d69b809b467c83e12408ea7 /ext/pdo | |
| parent | cf5b3fb16641b6389137cbabbb4fb0f39e409ee0 (diff) | |
| parent | 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da (diff) | |
| download | php-git-84e35fb2e0fcd7400d289e06395c975fc7a77816.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo_sql_parser.c | 4 | ||||
| -rw-r--r-- | ext/pdo/pdo_sql_parser.re | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index ec488e053f..37c71987a9 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -761,9 +761,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index d4272d679b..80e3b4f95f 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -408,9 +408,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } |