Commit 840c55c5 authored by jonnybradley's avatar jonnybradley

[MRG] Automatic merge, branches/7.x 33652 to 33658

parent f403349d
......@@ -19,10 +19,9 @@
//this script may only be included - so its better to err & die if called directly.
//smarty is not there - we need setup
require_once('tiki-setup.php');
global $access, $tikilib, $headerlib;
$access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));
require_once ('lib/tikilib.php'); # httpScheme()
/*
* Determine the settings used to display the thread
*/
......
......@@ -1532,9 +1532,9 @@ CREATE TABLE `tiki_modules` (
INSERT INTO `tiki_modules` (name,position,ord,cache_time,params,groups) VALUES
('menu','l',1,7200,'id=42&flip=y','a:1:{i:0;s:10:"Registered";}'),
('logo','t',1,7200,'nobox=y&style=float%3Aleft%3Bmargin%3A0+30px%3B','a:0:{}'),
('login_box','t',2,0,'mode=header&nobox=y&style=position%3Aabsolute%3Bright%3A30px%3Btop%3A5px%3B','a:0:{}'),
('quickadmin','t',3,7200,'nobox=y&style=position%3A+absolute%3B+right%3A+200px%3B','a:1:{i:0;s:6:"Admins";}'),
('logo','t',1,7200,'nobox=y','a:0:{}'),
('login_box','t',2,0,'mode=popup&nobox=y','a:0:{}'),
('quickadmin','t',3,7200,'nobox=y','a:1:{i:0;s:6:"Admins";}'),
('rsslist','b',1,7200,'nobox=y','a:0:{}'),
('poweredby','b',2,7200,'nobox=y&icons=n&version=n','a:0:{}');
......
......@@ -1251,7 +1251,9 @@ class TrackerLib extends TikiLib
$res['field_values'] = $this->get_item_fields($trackerId, $res['itemId'], $listfields, $res['itemUser']);
foreach ($res['field_values'] as $field) {
$res[$field['fieldId'].$field["lang"]] = $field["value"];
if (isset($field['lang'])) { // seems odd, not sure what this achieves?
$res[$field['fieldId'].$field["lang"]] = $field["value"];
}
}
}
if (!empty($asort_mode)) {
......@@ -1648,7 +1650,7 @@ class TrackerLib extends TikiLib
} else {
$name = $fields->fetchOne('name', array('fieldId' => (int) $fieldId));
}
$value = $array["value"];
$value = isset($array["value"]) ? $array["value"] : null;
if ($array['type'] == 'C') {
$calc = preg_replace('/#([0-9]+)/', '$fil[\1]', $array['options']);
......@@ -4127,6 +4129,10 @@ class TrackerLib extends TikiLib
$ret = array();
while ($res = $result->fetchRow()) {
$field_value['value'] = $res['value'];
$field_value['trackerId'] = $trackerId;
$field_value['type'] = $this->fields()->fetchOne('type', array(
'fieldId' => (int) $res['fieldId'],
));
$ret[$res['itemId']] = $this->get_field_handler($field_value, $res)->renderOutput(array(
'showlinks' => 'n',
));
......
{if $prefs.feature_page_title ne 'n'}<h1>{$info.pageName}</h1>{/if}
<div class="wikitext">{$info.parsed}</div>
{if $comments_cant}
{include file="comments.tpl"}
{/if}
......@@ -13,6 +13,7 @@ $access->check_feature('feature_print_indexed');
$inputConfiguration = array(
array( 'staticKeyFilters' => array(
'list' => 'alpha',
'comments' => 'alpha',
) ),
array( 'staticKeyFiltersForArrays' => array(
'languages' => 'alpha',
......@@ -213,6 +214,15 @@ class ObjectRenderer_Wiki extends ObjectRenderer // {{{
$options['display_template'] = 'print/print-' . $options['display'] . '_wiki.tpl';
$smarty->assign( 'info', $this->info );
if (isset($options['comments']) && $options['comments']) {
global $comments_objectId, $forum_mode, $comments_per_page;
$comments_objectId = 'wiki page:' . $this->info['pageName'];
$forum_mode = 'n';
$comments_per_page = 100;
$smarty->assign('tiki_p_post_comments', 'n');
include 'comments.php';
}
return $smarty->fetch( $options['display_template'] );
}
......@@ -369,6 +379,7 @@ foreach($indexPages as $page) {
$objectList->render( $smarty, null, array(
'decorator' => 'indexed',
'display' => 'object',
'comments' => $_REQUEST['comments'] == 'y',
) );
$smarty->display('print/print-page_footer.tpl');
......
......@@ -544,7 +544,8 @@ if ($_REQUEST["itemId"]) {
}
if ($current_field_fields['isMain'] == 'y') {
$tracker_item_main_value .= (empty($tracker_item_main_value) ? '' : ' ') . $current_field_ins['value'];
$tracker_item_main_value .= (empty($tracker_item_main_value) ? '' : ' ') .
(isset($current_field_ins['value']) ? $current_field_ins['value'] : '');
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment