Bladeren bron

Fix a bug to get size of user (SQLite)

Marien Fressinaud 11 jaren geleden
bovenliggende
commit
5797344aff
3 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 2 1
      app/Controllers/userController.php
  2. 1 1
      app/Models/EntryDAOSQLite.php
  3. 2 0
      lib/Minz/ModelPdo.php

+ 2 - 1
app/Controllers/userController.php

@@ -94,14 +94,15 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 
 		Minz_View::prependTitle(_t('users.manage') . ' · ');
 
+		// Get the correct current user.
 		$userDAO = new FreshRSS_UserDAO();
-
 		$username = Minz_Request::param('u', Minz_Session::param('currentUser'));
 		if (!$userDAO->exist($username)) {
 			$username = Minz_Session::param('currentUser');
 		}
 		$this->view->current_user = $username;
 
+		// Get information about the current user.
 		$entryDAO = FreshRSS_Factory::createEntryDao($this->view->current_user);
 		$this->view->nb_articles = $entryDAO->count();
 		$this->view->size_user = $entryDAO->size();

+ 1 - 1
app/Models/EntryDAOSQLite.php

@@ -124,6 +124,6 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO {
 	}
 
 	public function size($all = false) {
-		return @filesize(DATA_PATH . '/' . Minz_Session::param('currentUser', '_') . '.sqlite');
+		return @filesize(DATA_PATH . '/' . $this->current_user . '.sqlite');
 	}
 }

+ 2 - 0
lib/Minz/ModelPdo.php

@@ -24,6 +24,7 @@ class Minz_ModelPdo {
 	 */
 	protected $bd;
 
+	protected $current_user;
 	protected $prefix;
 
 	public function dbType() {
@@ -46,6 +47,7 @@ class Minz_ModelPdo {
 		if ($currentUser === null) {
 			$currentUser = Minz_Session::param('currentUser', '_');
 		}
+		$this->current_user = $currentUser;
 
 		try {
 			$type = $db['type'];