Forráskód Böngészése

ZF-8931
- Fixed constant handling in Sqlsrv driver to not use error suppression

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20626 44c647ce-9c0f-0410-b52a-842ac1e357ba

ralph 16 éve
szülő
commit
199554cfd6
1 módosított fájl, 4 hozzáadás és 4 törlés
  1. 4 4
      library/Zend/Db/Adapter/Sqlsrv.php

+ 4 - 4
library/Zend/Db/Adapter/Sqlsrv.php

@@ -148,11 +148,11 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract
             foreach ($this->_config['driver_options'] as $option => $value) {
                 // A value may be a constant.
                 if (is_string($value)) {
-                    $constantValue = @constant(strtoupper($value));
-                    if ($constantValue === null) {
-                        $connectionInfo[$option] = $value;
+                    $constantName = strtoupper($value);
+                    if (defined($constantName)) {
+                        $connectionInfo[$option] = constant($constantName);
                     } else {
-                        $connectionInfo[$option] = $constantValue;
+                        $connectionInfo[$option] = $value;
                     }
                 }
             }