Merge pull request #632 from Lynesth/patch-7

Prevent R::selectDatabase from changing BeanHelper
gabordemooij · Apr 27, 2018 · fcbaeaf · fcbaeaf
2 parents 3b52e0c + 07eec79
commit fcbaeaf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/RedBeanPHP/Facade.php b/RedBeanPHP/Facade.php
@@ -1540,7 +1540,9 @@ public static function configureFacadeWithToolbox( ToolBox $tb )
 		self::$labelMaker         = new LabelMaker( self::$toolbox );
 		$helper                   = new SimpleModelHelper();
 		$helper->attachEventListeners( self::$redbean );
-		self::$redbean->setBeanHelper( new SimpleFacadeBeanHelper );
+		if (self::$redbean->getBeanHelper() == NULL) {
+			self::$redbean->setBeanHelper( new SimpleFacadeBeanHelper );
+		}
 		self::$duplicationManager = new DuplicationManager( self::$toolbox );
 		self::$tagManager         = new TagManager( self::$toolbox );
 		return $oldTools;