Fix bug size with SQLite

pull/692/head
Marien Fressinaud 10 years ago
parent 9478d2f011
commit ee5bbe4826
  1. 2
      app/Controllers/configureController.php
  2. 3
      lib/Minz/ModelPdo.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();

@ -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'];

Loading…
Cancel
Save