Improve workaround for keeping config file format BC

2016-07-22 15:31:42 +02:00
parent e4f95190c3
commit b1305beb0f
2 changed files with 8 additions and 10 deletions
--- a/lib/model.php
+++ b/lib/model.php
@@ -80,18 +80,10 @@ class model
     */
    private function _getStore()
    {
-        // FIXME
-        // Workaround so that config value don't need to be changed
-        $callable = str_replace(
-            array('privatebin_data', 'privatebin_db'),
-            array('PrivateBin\\data\\data', 'PrivateBin\\data\\db'),
-            $this->_conf->getKey('class', 'model')
-        );
-
        if ($this->_store === null)
        {
            $this->_store = forward_static_call(
-                array($callable, 'getInstance'),
+                array($this->_conf->getKey('class', 'model'), 'getInstance'),
                $this->_conf->getSection('model_options')
            );
        }