From 41ce16f1b89ea3cb35132ed9a7cf62b54319eb89 Mon Sep 17 00:00:00 2001 From: Shish Date: Wed, 29 Jan 2020 11:30:52 +0000 Subject: [PATCH] ratings works with sqlite (unit tests pass, at least) --- ext/rating/info.php | 1 - ext/rating/main.php | 9 ++++----- ext/rating/test.php | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/rating/info.php b/ext/rating/info.php index 321b58f1..c7836f29 100644 --- a/ext/rating/info.php +++ b/ext/rating/info.php @@ -22,5 +22,4 @@ class RatingsInfo extends ExtensionInfo
  • rating=sq -- safe and questionable images "; - //public $db_support = [DatabaseDriver::MYSQL, DatabaseDriver::PGSQL]; } diff --git a/ext/rating/main.php b/ext/rating/main.php index 8388ed89..0eb459dc 100644 --- a/ext/rating/main.php +++ b/ext/rating/main.php @@ -225,16 +225,16 @@ class Ratings extends Extension { global $user; - if (is_null($event->term)) { - return; - } - $matches = []; if (is_null($event->term) && $this->no_rating_query($event->context)) { $set = Ratings::privs_to_sql(Ratings::get_user_default_ratings($user)); $event->add_querylet(new Querylet("rating IN ($set)")); } + if (is_null($event->term)) { + return; + } + if (preg_match($this->search_regexp, strtolower($event->term), $matches)) { $ratings = $matches[1] ? $matches[1] : $matches[2][0]; @@ -420,7 +420,6 @@ class Ratings extends Extension return $ratings; } - public static function get_user_class_privs(User $user): array { global $config; diff --git a/ext/rating/test.php b/ext/rating/test.php index ad583c45..45d17c6d 100644 --- a/ext/rating/test.php +++ b/ext/rating/test.php @@ -29,6 +29,8 @@ class RatingsTest extends ShimmiePHPUnitTestCase public function testRatingExplicit() { + global $config; + $config->set_array("ext_rating_anonymous_privs", ["s", "q"]); $this->log_in_as_user(); $image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx"); $image = Image::by_id($image_id);