diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/ItemObject.php | 6 | ||||
-rw-r--r-- | include/bbcode.php | 2 | ||||
-rw-r--r-- | include/conversation.php | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 170f013a1..40f85f5ef 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -10,6 +10,7 @@ require_once('boot.php'); /** * An item */ + class Item extends BaseObject { public $data = array(); private $template = 'conv_item.tpl'; @@ -458,6 +459,11 @@ class Item extends BaseObject { return $this->template; } + + private function set_template($t) { + $this->template = $t; + } + /** * Check if this is a toplevel post */ diff --git a/include/bbcode.php b/include/bbcode.php index 35ce2b918..dfb0b9fb8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -133,7 +133,7 @@ function bb_parse_crypt($match) { } function bb_qr($match) { - return '<img class="zrl" src="' . z_root() . '/photo/qr?f=&qr=' . urlencode($match[1]) . '" alt="' . t('QR code') . '" />'; + return '<img class="zrl" src="' . z_root() . '/photo/qr?f=&qr=' . urlencode($match[1]) . '" alt="' . t('QR code') . '" title="' . urlencode($match[1]) . '" />'; } diff --git a/include/conversation.php b/include/conversation.php index 99252027d..62db34974 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -782,6 +782,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ // $tx1 = dba_timer(); $item_object = new Item($item); $conv->add_thread($item_object); + if($page_mode === 'list') + $item_object->set_template('conv_list.tpl'); + // $tx2 = dba_timer(); // if($mode === 'network') // profiler($tx1,$tx2,'add thread ' . $item['id']); |