mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 05:14:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug size with SQLite

Browse Source
This commit is contained in:
Marien Fressinaud
2014-10-30 19:19:09 +01:00
parent 9478d2f011
commit ee5bbe4826
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/configureController.php
View File

@@ -225,7 +225,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
Minz_View::prependTitle(_t('archiving_configuration') . ' · ');
$entryDAO = FreshRSS_Factory::createEntryDao();
$entryDAO = FreshRSS_Factory::createEntryDao('freshrss');
$this->view->nb_total = $entryDAO->count();
$this->view->size_user = $entryDAO->size();

3
lib/Minz/ModelPdo.php
View File

@@ -17,6 +17,7 @@ class Minz_ModelPdo {
private static $sharedBd = null;
private static $sharedPrefix;
private static $has_transaction = false;
private static $sharedCurrentUser;
protected static $sharedDbType;
/**
@@ -39,6 +40,7 @@ class Minz_ModelPdo {
if (self::$useSharedBd && self::$sharedBd != null && $currentUser === null) {
$this->bd = self::$sharedBd;
$this->prefix = self::$sharedPrefix;
$this->current_user = self::$sharedCurrentUser;
return;
}
@@ -48,6 +50,7 @@ class Minz_ModelPdo {
$currentUser = Minz_Session::param('currentUser', '_');
}
$this->current_user = $currentUser;
self::$sharedCurrentUser = $currentUser;
try {
$type = $db['type'];