diff --git a/core/imageboard/image.php b/core/imageboard/image.php index 27738817..7dc45712 100644 --- a/core/imageboard/image.php +++ b/core/imageboard/image.php @@ -659,16 +659,12 @@ class Image return $this->locked; } - public function set_locked(bool $tf): void + public function set_locked(bool $locked): void { global $database; - $ln = $tf ? "Y" : "N"; - $sln = $database->scoreql_to_sql('SCORE_BOOL_'.$ln); - $sln = str_replace("'", "", $sln); - $sln = str_replace('"', "", $sln); - if (bool_escape($sln) !== $this->locked) { - $database->execute("UPDATE images SET locked=:yn WHERE id=:id", ["yn"=>$sln, "id"=>$this->id]); - log_info("core_image", "Setting Image #{$this->id} lock to: $ln"); + if ($locked !== $this->locked) { + $database->execute("UPDATE images SET locked=:yn WHERE id=:id", ["yn"=>$locked, "id"=>$this->id]); + log_info("core_image", "Setting Image #{$this->id} lock to: $locked"); } } diff --git a/core/install.php b/core/install.php index 74bb3e72..c86cec6e 100644 --- a/core/install.php +++ b/core/install.php @@ -255,7 +255,7 @@ function create_tables(Database $db) width INTEGER NOT NULL, height INTEGER NOT NULL, posted TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N, + locked BOOLEAN NOT NULL DEFAULT FALSE, FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT "); $db->execute("CREATE INDEX images_owner_id_idx ON images(owner_id)", []); diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php index 768f55c8..1cb8530d 100644 --- a/ext/upgrade/main.php +++ b/ext/upgrade/main.php @@ -32,9 +32,9 @@ class Upgrade extends Extension // now done again as v9 with PDO if ($this->get_version("db_version") < 8) { - $database->execute($database->scoreql_to_sql( - "ALTER TABLE images ADD COLUMN locked SCORE_BOOL NOT NULL DEFAULT SCORE_BOOL_N" - )); + $database->execute( + "ALTER TABLE images ADD COLUMN locked BOOLEAN NOT NULL DEFAULT FALSE" + ); $this->set_version("db_version", 8); }