Selaa lähdekoodia

Merge branch 'master' of https://github.com/unaio/una

AntonLV 8 vuotta sitten
vanhempi
sitoutus
cb44a3ef75
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 4 2
      inc/classes/BxDolDb.php
  2. 1 1
      studio/classes/BxDolStudioToolsAudit.php

+ 4 - 2
inc/classes/BxDolDb.php

@@ -217,8 +217,10 @@ class BxDolDb extends BxDolFactory implements iBxDolSingleton
      */
      */
     public function pdoExceptionHandler($oException)
     public function pdoExceptionHandler($oException)
     {
     {
-    	if(!($oException instanceof PDOException))
-    		return;
+        if(!($oException instanceof PDOException)) {
+            throw $oException;
+            return;
+        }
 
 
 		if(!isset($oException->errorInfo[self::$_sErrorKey]))
 		if(!isset($oException->errorInfo[self::$_sErrorKey]))
 			$oException->errorInfo[self::$_sErrorKey] = array(
 			$oException->errorInfo[self::$_sErrorKey] = array(

+ 1 - 1
studio/classes/BxDolStudioToolsAudit.php

@@ -46,7 +46,7 @@ class BxDolStudioToolsAudit extends BxDol
             BX_DOL_AUDIT_OK => _t('_sys_audit_title_ok'),
             BX_DOL_AUDIT_OK => _t('_sys_audit_title_ok'),
         );
         );
 
 
-        $this->sMinPhpVer = '5.5.0';
+        $this->sMinPhpVer = '5.5.10';
         $this->aPhpSettings = array (
         $this->aPhpSettings = array (
             'allow_url_fopen' => array('op' => '=', 'val' => true, 'type' => 'bool'),
             'allow_url_fopen' => array('op' => '=', 'val' => true, 'type' => 'bool'),
             'allow_url_include' => array('op' => '=', 'val' => false, 'type' => 'bool'),
             'allow_url_include' => array('op' => '=', 'val' => false, 'type' => 'bool'),