diff options
| author | czaks <marcin@6irc.net> | 2014-05-05 17:29:59 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-05-05 17:29:59 +0200 |
| commit | 72c7e28a0e6d55b6ca8be70aab53352c3cb4ce38 (patch) | |
| tree | 2e0cbfc83734514f758b8cc591bab34a592e2296 /templates/themes/catalog/theme.php | |
| parent | e3ac13289d6df29a8cd4f1678c258c9d26e14e47 (diff) | |
| parent | 855618b2a0d367b2e2d46b2fce1926cf13e0e94e (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'templates/themes/catalog/theme.php')
| -rw-r--r-- | templates/themes/catalog/theme.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php index e3a45d64..cf2095d0 100644 --- a/templates/themes/catalog/theme.php +++ b/templates/themes/catalog/theme.php @@ -40,9 +40,14 @@ while ($post = $query->fetch(PDO::FETCH_ASSOC)) { $post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])); $post['board_name'] = $board['name']; + + if ($post['embed'] && preg_match('/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i', $post['embed'], $matches)) { + $post['youtube'] = $matches[2]; + } + if (isset($post['files'])) $files = json_decode($post['files']); - if ($files[0]->file == 'deleted') continue; + if ($files[0]->file == 'deleted') continue; $post['file'] = $config['uri_thumb'] . $files[0]->thumb; if ($settings['use_tooltipster']) { @@ -52,7 +57,6 @@ $post['last_reply_difference'] = ago(time() - $post['last_reply']); } - $recent_posts[] = $post; } |