james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'holly/master'

Browse Source
This commit is contained in:
Shish 2021-11-16 14:44:13 +00:00
commit 3cb0a6a2c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/rss_images/main.php
View File

@ -31,7 +31,7 @@ class RSSImages extends Extension
$images = Image::find_images(($page_number-1)*$page_size, $page_size, $search_terms); $images = Image::find_images(($page_number-1)*$page_size, $page_size, $search_terms);
$this->do_rss($images, $search_terms, $page_number); $this->do_rss($images, $search_terms, $page_number);
} catch (SearchTermParseException $stpe) { } catch (SearchTermParseException $stpe) {
$this->theme->display_error(400, "Search parse error", $pde->error); $this->theme->display_error(400, "Search parse error", $stpe->error);
} catch (PermissionDeniedException $pde) { } catch (PermissionDeniedException $pde) {
$this->theme->display_error(403, "Permission denied", $pde->error); $this->theme->display_error(403, "Permission denied", $pde->error);
} }

4
ext/user/main.php
View File

@ -385,10 +385,10 @@ class UserPage extends Extension
$matches = []; $matches = [];
if (preg_match(self::USER_SEARCH_REGEX, $event->term, $matches)) { if (preg_match(self::USER_SEARCH_REGEX, $event->term, $matches)) {
$duser = User::by_name($matches[1]); $duser = User::by_name($matches[2]);
if (is_null($duser)) { if (is_null($duser)) {
throw new SearchTermParseException( throw new SearchTermParseException(
"Can't find the user named ".html_escape($matches[1]) "Can't find the user named ".html_escape($matches[2])
); );
} }
$event->add_querylet(new Querylet("images.owner_id ${matches[1]}= {$duser->id}")); $event->add_querylet(new Querylet("images.owner_id ${matches[1]}= {$duser->id}"));