Marien Fressinaud 11 лет назад
Родитель
Сommit
ee5bbe4826
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      app/Controllers/configureController.php
  2. 3 0
      lib/Minz/ModelPdo.php

+ 1 - 1
app/Controllers/configureController.php

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

+ 3 - 0
lib/Minz/ModelPdo.php

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