From 4a7a620b227bdc881b1a45b6d6e9c43b215bd70a Mon Sep 17 00:00:00 2001 From: gebeer Date: Thu, 28 Jan 2016 11:27:58 +0700 Subject: [PATCH 1/2] converted DB queries to PDO The module threw an error on servers without mysqli extension installed and still used the old wire("db"). Now working on 2.7.2. --- TextformatterVideoEmbed.module | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/TextformatterVideoEmbed.module b/TextformatterVideoEmbed.module index e7433df..d889cb0 100644 --- a/TextformatterVideoEmbed.module +++ b/TextformatterVideoEmbed.module @@ -68,12 +68,13 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul */ protected function getEmbedCode($oembedURL, $videoID) { - $db = wire('db'); - $videoID = $db->escape_string($videoID); - $result = $db->query("SELECT embed_code FROM " . self::dbTableName . " WHERE video_id='$videoID'"); + $database = wire('database'); + $videoID = $database->escape_string($videoID); + $result = $database->query("SELECT embed_code FROM " . self::dbTableName . " WHERE video_id='$videoID'"); - if($result->num_rows) { - list($embedCode) = $result->fetch_row(); + if($result->rowCount()) { + + list($embedCode) = $result->fetch(); } else { @@ -87,15 +88,16 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul $sql = "INSERT INTO " . self::dbTableName . " SET " . "video_id='$videoID', " . - "embed_code='" . $db->escape_string($embedCode) . "', " . + "embed_code='" . $database->escape_string($embedCode) . "', " . "created=NOW() "; - $db->query($sql); + $database->query($sql); } - $result->free(); } + $result->closeCursor(); + // account for possibility that stored embed code contains http version while requested on https if($this->http == 'https') $embedCode = str_replace('http://', 'https://', $embedCode); @@ -261,7 +263,7 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul * */ public function ___uninstall() { - try { wire('db')->query("DROP TABLE " . self::dbTableName); } catch(Exception $e) { } + try { wire('database')->query("DROP TABLE " . self::dbTableName); } catch(Exception $e) { } } From a508f7fdf9a12b4893693a9d97b3cdeb20bbd8a1 Mon Sep 17 00:00:00 2001 From: gebeer Date: Sat, 30 Jan 2016 14:49:19 +0700 Subject: [PATCH 2/2] changed db to database in l. 257 --- TextformatterVideoEmbed.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TextformatterVideoEmbed.module b/TextformatterVideoEmbed.module index d889cb0..1164a3e 100644 --- a/TextformatterVideoEmbed.module +++ b/TextformatterVideoEmbed.module @@ -254,7 +254,7 @@ class TextformatterVideoEmbed extends Textformatter implements ConfigurableModul "created TIMESTAMP NOT NULL " . ")"; - wire('db')->query($sql); + wire('database')->query($sql); }