mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-29 13:52:10 +03:00
Merged v5.75.1 into main
This commit is contained in:
commit
feb15d2273
@ -222,10 +222,10 @@ export default class MembersController extends Controller {
|
||||
if (filterParam) {
|
||||
// If the provided filter param is a single filter related to newsletter subscription status
|
||||
// remove the surrounding brackets to prevent https://github.com/TryGhost/NQL/issues/16
|
||||
const NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(subscribed:(?:true|false)[+,]email_disabled:[01]\)$/;
|
||||
const SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE = /^\(newsletters\.slug:[^()]+[+,]email_disabled:[01]\)$/;
|
||||
const BRACKETS_SURROUNDED_RE = /^\(.*\)$/;
|
||||
const MULTIPLE_GROUPS_RE = /\).*\(/;
|
||||
|
||||
if (NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam) || SPECIFIC_NEWSLETTER_SUBSCRIPTION_STATUS_RE.test(filterParam)) {
|
||||
if (BRACKETS_SURROUNDED_RE.test(filterParam) && !MULTIPLE_GROUPS_RE.test(filterParam)) {
|
||||
filterParam = filterParam.slice(1, -1);
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ghost-admin",
|
||||
"version": "5.75.0",
|
||||
"version": "5.75.1",
|
||||
"description": "Ember.js admin client for Ghost",
|
||||
"author": "Ghost Foundation",
|
||||
"homepage": "http://ghost.org",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ghost",
|
||||
"version": "5.75.0",
|
||||
"version": "5.75.1",
|
||||
"description": "The professional publishing platform",
|
||||
"author": "Ghost Foundation",
|
||||
"homepage": "https://ghost.org",
|
||||
|
Loading…
Reference in New Issue
Block a user