summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-30 19:19:09 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-30 19:19:09 +0100
commitee5bbe48269a2fd5bc9c175fdb1e5a92a2c04502 (patch)
treed3005b8cffa17121c4db09b5248ff104f17a2028
parent9478d2f0116be69e08071dd02c0f945c5f78d7e0 (diff)
Fix bug size with SQLite
-rwxr-xr-xapp/Controllers/configureController.php2
-rw-r--r--lib/Minz/ModelPdo.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index cafd0e8a8..deb8cc849 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -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();
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 827c89c69..6198cd85c 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -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'];