RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some errors

pull/221/head
Varun Patil 2022-11-16 00:16:07 -08:00
parent a6ef3ac9bf
commit bd89c9d355
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Controller/FoldersTrait.php
View File

@ -13,7 +13,7 @@ trait FoldersTrait
/** /**
* Get subfolders entry for days response. * Get subfolders entry for days response.
*/ */
public function getSubfoldersEntry(Folder &$folder) public function getSubfoldersEntry(Folder $folder)
{ {
// Ugly: get the view of the folder with reflection // Ugly: get the view of the folder with reflection
// This is unfortunately the only way to get the contents of a folder // This is unfortunately the only way to get the contents of a folder

4
lib/Db/TimelineQueryDays.php
View File

@ -295,7 +295,9 @@ trait TimelineQueryDays
$types = $query->getParameterTypes(); $types = $query->getParameterTypes();
// Get SQL // Get SQL
$CTE_SQL = $params['cteFoldersArchive'] ? CTE_FOLDERS_ARCHIVE : CTE_FOLDERS; $CTE_SQL = \array_key_exists('cteFoldersArchive', $params) && $params['cteFoldersArchive']
? CTE_FOLDERS_ARCHIVE
: CTE_FOLDERS;
// Add WITH clause if needed // Add WITH clause if needed
if (false !== strpos($sql, 'cte_folders')) { if (false !== strpos($sql, 'cte_folders')) {