|
@@ -1226,7 +1226,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
|
|
|
if ($filter->getIntextRegex() !== null) {
|
|
if ($filter->getIntextRegex() !== null) {
|
|
|
if (static::isCompressed()) { // MySQL-only
|
|
if (static::isCompressed()) { // MySQL-only
|
|
|
foreach ($filter->getIntextRegex() as $content) {
|
|
foreach ($filter->getIntextRegex() as $content) {
|
|
|
- $sub_search .= 'AND ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ') ';
|
|
|
|
|
|
|
+ $sub_search .= 'AND ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ' ';
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
foreach ($filter->getIntextRegex() as $content) {
|
|
foreach ($filter->getIntextRegex() as $content) {
|
|
@@ -1295,7 +1295,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
|
|
|
if ($filter->getNotIntextRegex() !== null) {
|
|
if ($filter->getNotIntextRegex() !== null) {
|
|
|
if (static::isCompressed()) { // MySQL-only
|
|
if (static::isCompressed()) { // MySQL-only
|
|
|
foreach ($filter->getNotIntextRegex() as $content) {
|
|
foreach ($filter->getNotIntextRegex() as $content) {
|
|
|
- $sub_search .= 'AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ') ';
|
|
|
|
|
|
|
+ $sub_search .= 'AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ' ';
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
foreach ($filter->getNotIntextRegex() as $content) {
|
|
foreach ($filter->getNotIntextRegex() as $content) {
|
|
@@ -1365,7 +1365,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
|
|
|
foreach ($filter->getNotSearchRegex() as $search_value) {
|
|
foreach ($filter->getNotSearchRegex() as $search_value) {
|
|
|
if (static::isCompressed()) { // MySQL-only
|
|
if (static::isCompressed()) { // MySQL-only
|
|
|
$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .
|
|
$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .
|
|
|
- ' ANT NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $search_value, $values) . ' ';
|
|
|
|
|
|
|
+ ' AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $search_value, $values) . ' ';
|
|
|
} else {
|
|
} else {
|
|
|
$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .
|
|
$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .
|
|
|
' AND NOT ' . static::sqlRegex($alias . 'content', $search_value, $values) . ' ';
|
|
' AND NOT ' . static::sqlRegex($alias . 'content', $search_value, $values) . ' ';
|