Merge branch 'master' into master

2022-04-25 13:33:53 +01:00
parent b56ad0020e 5ef0adc737
commit 87f928aff7
24 changed files with 389 additions and 417 deletions
--- a/lib/Tools/YoutubeHelper.php
+++ b/lib/Tools/YoutubeHelper.php
@@ -66,7 +66,9 @@ class YoutubeHelper
        if ($file) {
            $extra = serialize($extra);
            if($this->dbconn->getDBType() == "pgsql"){
-                $extra = pg_escape_bytea($extra);
+                if (function_exists("pg_escape_bytea")) {
+                    $extra = pg_escape_bytea($extra);
+                }
            }
            $data = [
                'uid' => $this->user,