Check whether filter is valid, before doing stuff for it
This commit is contained in:
parent
c02de748e5
commit
be63e18b0a
|
@ -26,7 +26,11 @@ class ActivityManager implements IManager {
|
||||||
private $extensions = array();
|
private $extensions = array();
|
||||||
|
|
||||||
/** @var array list of filters "name" => "is valid" */
|
/** @var array list of filters "name" => "is valid" */
|
||||||
protected $validFilters = array();
|
protected $validFilters = array(
|
||||||
|
'all' => true,
|
||||||
|
'by' => true,
|
||||||
|
'self' => true,
|
||||||
|
);
|
||||||
|
|
||||||
/** @var array list of type icons "type" => "css class" */
|
/** @var array list of type icons "type" => "css class" */
|
||||||
protected $typeIcons = array();
|
protected $typeIcons = array();
|
||||||
|
@ -123,6 +127,10 @@ class ActivityManager implements IManager {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function filterNotificationTypes($types, $filter) {
|
function filterNotificationTypes($types, $filter) {
|
||||||
|
if (!$this->isFilterValid($filter)) {
|
||||||
|
return $types;
|
||||||
|
}
|
||||||
|
|
||||||
foreach($this->extensions as $extension) {
|
foreach($this->extensions as $extension) {
|
||||||
$c = $extension();
|
$c = $extension();
|
||||||
if ($c instanceof IExtension) {
|
if ($c instanceof IExtension) {
|
||||||
|
@ -297,6 +305,9 @@ class ActivityManager implements IManager {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function getQueryForFilter($filter) {
|
function getQueryForFilter($filter) {
|
||||||
|
if (!$this->isFilterValid($filter)) {
|
||||||
|
return [null, null];
|
||||||
|
}
|
||||||
|
|
||||||
$conditions = array();
|
$conditions = array();
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
|
|
Loading…
Reference in New Issue