PHP Lint
parent
c1ae720656
commit
c3f874d4b4
|
@ -60,7 +60,7 @@ class ArchiveController extends ApiBase
|
||||||
|
|
||||||
// Create archive folder in the root of the user's configured timeline
|
// Create archive folder in the root of the user's configured timeline
|
||||||
$configPath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
|
$configPath = Exif::removeExtraSlash(Exif::getPhotosPath($this->config, $uid));
|
||||||
$configPaths = \explode(';', $configPath);
|
$configPaths = explode(';', $configPath);
|
||||||
$timelineFolders = [];
|
$timelineFolders = [];
|
||||||
$timelinePaths = [];
|
$timelinePaths = [];
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ class ArchiveController extends ApiBase
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hit a timeline folder
|
// Hit a timeline folder
|
||||||
if (in_array($parent->getPath(), $timelinePaths)) {
|
if (\in_array($parent->getPath(), $timelinePaths, true)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,9 @@ trait TimelineQueryDays
|
||||||
$query->addSelect('f.etag', 'f.path', 'f.name AS basename');
|
$query->addSelect('f.etag', 'f.path', 'f.name AS basename');
|
||||||
|
|
||||||
// SELECT rootid if not a single folder
|
// SELECT rootid if not a single folder
|
||||||
if ($recursive) $query->addSelect('cte_f.rootid');
|
if ($recursive) {
|
||||||
|
$query->addSelect('cte_f.rootid');
|
||||||
|
}
|
||||||
|
|
||||||
// JOIN with mimetypes to get the mimetype
|
// JOIN with mimetypes to get the mimetype
|
||||||
$query->join('f', 'mimetypes', 'mimetypes', $query->expr()->eq('f.mimetype', 'mimetypes.id'));
|
$query->join('f', 'mimetypes', 'mimetypes', $query->expr()->eq('f.mimetype', 'mimetypes.id'));
|
||||||
|
|
|
@ -4,9 +4,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace OCA\Memories;
|
namespace OCA\Memories;
|
||||||
|
|
||||||
use OCA\Memories\AppInfo\Application;
|
|
||||||
use OCP\IConfig;
|
|
||||||
|
|
||||||
class Util
|
class Util
|
||||||
{
|
{
|
||||||
public static $TAG_DAYID_START = -(1 << 30); // the world surely didn't exist
|
public static $TAG_DAYID_START = -(1 << 30); // the world surely didn't exist
|
||||||
|
|
Loading…
Reference in New Issue