friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Little fixes (#5414) 

* We now store the item delivery data in a separate table

* Reorganized table structure

* Fix  a notice when using the profiler / ensure that permissions are strings
This commit is contained in:
Michael Vogel 2018-07-20 00:40:39 +02:00 committed by Hypolite Petovan
parent b2899d76cf
commit 01b67c4eb3
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/App.php
View File

@ -154,25 +154,6 @@ class App
$this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR); $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
// The order of the following calls is important to ensure proper initialization
$this->loadConfigFiles();
$this->loadDatabase();
$this->determineMode();
$this->determineUrlPath();
Config::load();
if ($this->mode & self::MODE_DBAVAILABLE) {
Core\Addon::loadHooks();
$this->loadAddonConfig();
}
$this->loadDefaultTimezone();
$this->performance['start'] = microtime(true); $this->performance['start'] = microtime(true);
$this->performance['database'] = 0; $this->performance['database'] = 0;
$this->performance['database_write'] = 0; $this->performance['database_write'] = 0;
@ -194,6 +175,25 @@ class App
$this->callstack['rendering'] = []; $this->callstack['rendering'] = [];
$this->callstack['parser'] = []; $this->callstack['parser'] = [];
// The order of the following calls is important to ensure proper initialization
$this->loadConfigFiles();
$this->loadDatabase();
$this->determineMode();
$this->determineUrlPath();
Config::load();
if ($this->mode & self::MODE_DBAVAILABLE) {
Core\Addon::loadHooks();
$this->loadAddonConfig();
}
$this->loadDefaultTimezone();
$this->page = [ $this->page = [
'aside' => '', 'aside' => '',
'bottom' => '', 'bottom' => '',

8
src/Model/PermissionSet.php
View File

@ -24,10 +24,10 @@ class PermissionSet extends BaseObject
public static function fetchIDForPost($postarray) public static function fetchIDForPost($postarray)
{ {
$condition = ['uid' => $postarray['uid'], $condition = ['uid' => $postarray['uid'],
'allow_cid' => self::sortPermissions($postarray['allow_cid']), 'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
'allow_gid' => self::sortPermissions($postarray['allow_gid']), 'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
'deny_cid' => self::sortPermissions($postarray['deny_cid']), 'deny_cid' => self::sortPermissions(defaults($postarray, 'deny_cid', '')),
'deny_gid' => self::sortPermissions($postarray['deny_gid'])]; 'deny_gid' => self::sortPermissions(defaults($postarray, 'deny_gid', ''))];
$set = dba::selectFirst('permissionset', ['id'], $condition); $set = dba::selectFirst('permissionset', ['id'], $condition);