diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-05 13:02:43 +0400 |
| commit | cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28 (patch) | |
| tree | dfcce3d9dbf2a12e10ada6edf2f66dc801cd0fc5 /ext/pdo_firebird/firebird_driver.c | |
| parent | 83d45d0a04e3cca8282911c8a384a73297f7375f (diff) | |
| parent | 149568f4da75a148d6ca71073b353f0d5f8f477a (diff) | |
| download | php-git-cd4b4dfc4d661c0bb6f8bffc4c7d285194904e28.tar.gz | |
Merge branch 'master' into refactoring2
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
Diffstat (limited to 'ext/pdo_firebird/firebird_driver.c')
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index aa6634058a..e45f7981d9 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -567,7 +567,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *val TS #else HMODULE l = GetModuleHandle("fbclient"); - if (!l && !(l = GetModuleHandle("gds32"))) { + if (!l) { break; } info_func = (info_func_t)GetProcAddress(l, "isc_get_client_version"); @@ -575,9 +575,7 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, long attr, zval *val TS if (info_func) { info_func(tmp); ZVAL_STRING(val,tmp,1); - } else { - ZVAL_STRING(val,"Firebird 1.0/Interbase 6",1); - } + } #else ZVAL_NULL(val); #endif |