diff options
| author | Mario <mario@mariovavti.com> | 2019-11-25 08:41:34 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-25 08:41:34 +0000 |
| commit | 004861fbb726353ff804921332af7cf371db14e3 (patch) | |
| tree | 593ad3d8059137b72e88f0929a84ea1acfe7fd59 /Zotlabs | |
| parent | 8727f12b18788a7a1dc450130ceb0ea7524b649a (diff) | |
| download | volse-hubzilla-004861fbb726353ff804921332af7cf371db14e3.tar.gz volse-hubzilla-004861fbb726353ff804921332af7cf371db14e3.tar.bz2 volse-hubzilla-004861fbb726353ff804921332af7cf371db14e3.zip | |
merge opengraph fixes from dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Articles.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Channel.php | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php index e3ad54be8..2c43b4764 100644 --- a/Zotlabs/Module/Articles.php +++ b/Zotlabs/Module/Articles.php @@ -211,7 +211,7 @@ class Articles extends Controller { } // Add Opengraph markup - opengraph_add_meta(((! empty($items)) ? $r[0] : array()), App::$profile); + opengraph_add_meta((! empty($items) ? $r[0] : []), $channel); $mode = 'articles'; diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 3f617fd18..d975ac1bf 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -110,8 +110,20 @@ class Channel extends Controller { // Run profile_load() here to make sure the theme is set before // we start loading content - profile_load($which,$profile); + + // Add Opengraph markup + $mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : ''); + if(strpos($mid,'b64.') === 0) + $mid = @base64url_decode(substr($mid,4)); + + if($mid) + $r = q("SELECT * FROM item WHERE mid = '%s' AND uid = %d AND item_private = 0 LIMIT 1", + dbesc($mid), + intval($channel['channel_id']) + ); + + opengraph_add_meta($r ? $r[0] : [], $channel); } function get($update = 0, $load = false) { @@ -375,9 +387,6 @@ class Channel extends Controller { $items = array(); } - // Add Opengraph markup - opengraph_add_meta((isset($decoded) && (! empty($items)) ? $r[0] : array()), App::$profile); - if((! $update) && (! $load)) { if($decoded) |