]> granicus.if.org Git - php/commitdiff
- Fix missapplied logic inversion
authorMarcus Boerger <helly@php.net>
Mon, 28 Feb 2005 01:08:07 +0000 (01:08 +0000)
committerMarcus Boerger <helly@php.net>
Mon, 28 Feb 2005 01:08:07 +0000 (01:08 +0000)
ext/pdo/pdo.c
ext/pdo/pdo_stmt.c

index 748c08d9ff9d6c29ed0d970ad529df94fc6a1129..b4f83ed04249b669c8d89ef405ef2f61a5c5a03a 100755 (executable)
@@ -282,7 +282,7 @@ PHP_MINIT_FUNCTION(pdo)
        REGISTER_LONG_CONSTANT("PDO_FETCH_GROUP",(long)PDO_FETCH_GROUP, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_FETCH_UNIQUE",(long)PDO_FETCH_UNIQUE, CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_FETCH_CLASSTYPE",(long)PDO_FETCH_CLASSTYPE, CONST_CS|CONST_PERSISTENT);
-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 1
+#if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1
        REGISTER_LONG_CONSTANT("PDO_FETCH_SERIALIZE",(long)PDO_FETCH_SERIALIZE, CONST_CS|CONST_PERSISTENT);
 #endif
 
index ab8afd37dd5888fc0bce774d12bfdc8020cc4c0c..e8bb2dd0088b748a1a86b93f1cc34ca3fae27662 100755 (executable)
@@ -866,7 +866,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
                                                }
                                                PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
 #endif
-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 1
+#if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1
                                                if (!ce->unserialize) {
                                                        zend_throw_exception_ex(pdo_exception_ce, 0 TSRMLS_CC, "Class %s cannot be unserialized", ce->name);
                                                        return 0;