diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/oembed.php | 5 | ||||
| -rw-r--r-- | include/zot.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/oembed.php b/include/oembed.php index b6060c878..01cd8945f 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -433,9 +433,12 @@ function oembed_html2bbcode($text) { $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); // If it doesn't parse at all, just return the text. - $dom = @DOMDocument::loadHTML($html_text); + + $dom = new DOMDocument; + @$dom->loadHTML($html_text); if(! $dom) return $text; + $xpath = new DOMXPath($dom); $attr = "oembed"; diff --git a/include/zot.php b/include/zot.php index e68da4209..e1472b35e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -464,6 +464,7 @@ function zot_refresh($them, $channel = null, $force = false) { if($j['permissions']['data']) { $permissions = Crypto::unencapsulate( [ + 'encrypted' => true, 'data' => $j['permissions']['data'], 'key' => $j['permissions']['key'], 'iv' => $j['permissions']['iv'], @@ -472,6 +473,7 @@ function zot_refresh($them, $channel = null, $force = false) { $channel['channel_prvkey']); if($permissions) { $permissions = json_decode($permissions,true); +hz_syslog(print_r($permissions,true)); } logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA, LOG_DEBUG); } |