diff --git a/app/common.php b/app/common.php index 936da90..9dd5034 100644 --- a/app/common.php +++ b/app/common.php @@ -13,10 +13,10 @@ require __DIR__.'/functions.php'; PicoDb\Database::setInstance('db', function() { $db = new PicoDb\Database(array( 'driver' => 'sqlite', - 'filename' => Model\Database\get_path(), + 'filename' => Miniflux\Model\Database\get_path(), )); - if ($db->schema()->check(Schema\VERSION)) { + if ($db->schema('\Miniflux\Schema')->check(Miniflux\Schema\VERSION)) { return $db; } else { diff --git a/app/constants.php b/app/constants.php index f212733..18cdac5 100644 --- a/app/constants.php +++ b/app/constants.php @@ -1,6 +1,6 @@ Helper\generate_csrf(), 'config' => Model\Config\get_all(), - 'db_size' => filesize(\Model\Database\get_path()), + 'db_size' => filesize(Model\Database\get_path()), 'nb_unread_items' => Model\Item\count_by_status('unread'), 'menu' => 'config', 'title' => t('Preferences') diff --git a/app/controllers/console.php b/app/controllers/console.php index ea362b0..3b6c3eb 100644 --- a/app/controllers/console.php +++ b/app/controllers/console.php @@ -1,5 +1,10 @@ getRealPath(); if ($fileinfo->isFile()) { - \Model\Config\debug('[REMOVE] '.$filename); + Config\debug('[REMOVE] '.$filename); @unlink($filename); } else { cleanup_directory($filename); diff --git a/app/models/bookmark.php b/app/models/bookmark.php index 53ff4bd..aa4fbab 100644 --- a/app/models/bookmark.php +++ b/app/models/bookmark.php @@ -1,10 +1,10 @@ $filename, )); - if ($db->schema()->check(Schema\VERSION)) { + if ($db->schema('\Miniflux\Schema')->check(Schema\VERSION)) { $credentials = array( 'username' => $username, 'password' => password_hash($password, PASSWORD_BCRYPT) diff --git a/app/models/favicon.php b/app/models/favicon.php index 8a3426d..75cedcf 100644 --- a/app/models/favicon.php +++ b/app/models/favicon.php @@ -1,10 +1,10 @@ = t('Bookmarks') ?>