Give user a nice message when PDO isn't initialized prior to a driver.

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 9730b00a67459157bf037879772d822337f60bbf..81aa2e83e7d2de99fdefacf70d74d4d19d5b84cb 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -90,7 +90,10 @@ PDO_API int php_pdo_register_driver(pdo_driver_t *driver)
        if (driver->api_version != PDO_DRIVER_API)
                return FAILURE;
 
-       printf("registering PDO driver %s\n", driver->driver_name);
+       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+               zend_error(E_ERROR, "You MUST load PDO before loading any PDO drivers");
+               return FAILURE; /* NOTREACHED */
+       }
 
        return zend_hash_add(&pdo_driver_hash, (char*)driver->driver_name, driver->driver_name_len,
                        (void**)&driver, sizeof(driver), NULL);
@@ -98,6 +101,10 @@ PDO_API int php_pdo_register_driver(pdo_driver_t *driver)
 
 PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)
 {
+       if (!zend_hash_exists(&module_registry, "pdo", sizeof("pdo"))) {
+               return;
+       }
+
        zend_hash_del(&pdo_driver_hash, (char*)driver->driver_name, driver->driver_name_len);
 }