From 8f7517d9c248e6b7ba15e76af32c0e244c598ae4 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Thu, 27 Jul 2006 04:12:18 +0000 Subject: [PATCH] r977: Moved the global page items to be AFTER the edit/non-edit things so that the PCV selector will work without having to rename indicies --- showreport.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/showreport.php b/showreport.php index 77e0701..4956d29 100644 --- a/showreport.php +++ b/showreport.php @@ -89,27 +89,13 @@ if ($bug['hidden'] AND !can_perform('canviewhidden', $bug['product'])) $message->error_permission(); } -// ################################################################### -// global display items - -$show['subscribe'] = can_perform('cansubscribe', $bug['product']); - -$favourite = (bool)$db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE bugid = $bug[bugid] AND userid = " . $bugsys->userinfo['userid']); -$favouritetext = (($favourite) ? $lang->string('Remove from Favourites') : $lang->string('Add to Favourites')); - -$bug['userinfo'] = construct_user_display($bug); -$bug['datetime'] = $datef->format($bugsys->options['dateformat'], $bug['dateline']); -$bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title']; -$bug['component'] = (($bug['component']) ? $bugsys->datastore['product']["$bug[component]"]['title'] : ''); -$bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version']; - // ################################################################### // edit display if ($show['edit']) { $select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', $bug['severity']); - $show['changestatus'] = ((can_perform('canchangestatus', $bug['product'])) ? true : false); + $show['changestatus'] = (can_perform('canchangestatus', $bug['product']) ? true : false); if (can_perform('canchangestatus', $bug['product'])) { $select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', $bug['priority']); @@ -124,7 +110,7 @@ if ($show['edit']) $bug['priority'] = $bugsys->datastore['priority']["$bug[priority]"]['priority']; } - $show['assign'] = ((can_perform('canassign', $bug['product'])) ? true : false); + $show['assign'] = (can_perform('canassign', $bug['product']) ? true : false); if (can_perform('canassign', $bug['product']) AND is_array($bugsys->datastore['assignto'])) { foreach ($bugsys->datastore['assignto'] AS $dev) @@ -212,6 +198,20 @@ else } } +// ################################################################### +// global display items + +$show['subscribe'] = can_perform('cansubscribe', $bug['product']); + +$favourite = (bool)$db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE bugid = $bug[bugid] AND userid = " . $bugsys->userinfo['userid']); +$favouritetext = ($favourite ? $lang->string('Remove from Favourites') : $lang->string('Add to Favourites')); + +$bug['userinfo'] = construct_user_display($bug); +$bug['datetime'] = $datef->format($bugsys->options['dateformat'], $bug['dateline']); +$bug['product'] = $bugsys->datastore['product']["$bug[product]"]['title']; +$bug['component'] = ($bug['component'] ? $bugsys->datastore['product']["$bug[component]"]['title'] : ''); +$bug['version'] = $bugsys->datastore['version']["$bug[version]"]['version']; + // ################################################################### // custom field output @@ -304,7 +304,7 @@ $comments_fetch = $db->query(" FROM " . TABLE_PREFIX . "comment AS comment LEFT JOIN " . TABLE_PREFIX . "user AS user ON (comment.userid = user.userid) - WHERE comment.bugid = $bug[bugid]" . ((!can_perform('canviewhidden', $bug['product'])) ? " + WHERE comment.bugid = $bug[bugid]" . (!can_perform('canviewhidden', $bug['product']) ? " AND !hidden" : '') . " ORDER BY comment.dateline ASC" ); @@ -331,7 +331,7 @@ while ($comment = $db->fetch_array($comments_fetch)) eval('$comments .= "' . $template->fetch('showreport_comment') . '";'); } -$show['newreply'] = ((can_perform('canpostcomments', $bug['product'])) ? true : false); +$show['newreply'] = (can_perform('canpostcomments', $bug['product']) ? true : false); $bug['summary_title'] = $bug['summary']; if (is_array($hilight) AND !$show['edit']) -- 2.22.5