aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-16 20:33:50 -0800
committerfriendica <info@friendica.com>2014-11-16 20:33:50 -0800
commitcd404f571079dcbf021e44cae23568ba0c7f2214 (patch)
tree3ad86b23afc40aade66dfd3a6d5b000949c9e3f3
parentb3383a2547846e14c79cf59a3a0a0b1939e2aa71 (diff)
downloadvolse-hubzilla-cd404f571079dcbf021e44cae23568ba0c7f2214.tar.gz
volse-hubzilla-cd404f571079dcbf021e44cae23568ba0c7f2214.tar.bz2
volse-hubzilla-cd404f571079dcbf021e44cae23568ba0c7f2214.zip
remove old timers
-rw-r--r--include/conversation.php22
1 files changed, 2 insertions, 20 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ada2cbbd6..96864c29a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -419,8 +419,6 @@ function visible_activity($item) {
function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $prepared_item = '') {
- $tstart = dba_timer();
- $t0 = $t1 = $t2 = $t3 = $t4 = $t5 = $t6 = null;
$content_html = '';
$o = '';
@@ -452,8 +450,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if($mode === 'network') {
- $t1 = dba_timer();
-
$profile_owner = local_user();
$page_writeable = true;
@@ -790,7 +786,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$item['pagedrop'] = $page_dropping;
if($item['id'] == $item['parent']) {
-// $tx1 = dba_timer();
+
$item_object = new Item($item);
$conv->add_thread($item_object);
if($page_mode === 'list') {
@@ -799,18 +795,12 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
}
}
}
- $t2 = dba_timer();
+
$threads = $conv->get_template_data($alike, $dlike);
if(!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
$threads = array();
}
- $t3 = dba_timer();
- if($mode === 'network') {
- profiler($t1,$t2,'Conversation prepare');
- profiler($t2,$t3,'Conversation get_template');
- }
-
}
}
@@ -846,14 +836,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
));
- if($mode === 'network') {
- $t4 = dba_timer();
- profiler($t3,$t4,'conversation template');
- }
-
-// if($page_mode === 'preview')
-// logger('preview: ' . $o, LOGGER_DATA);
-
return $o;
}