[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16556] more on helpdesk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16556] more on helpdesk |
Date: |
Fri, 7 Apr 2017 07:59:07 -0400 (EDT) |
Revision: 16556
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16556
Author: sigurdne
Date: 2017-04-07 07:59:07 -0400 (Fri, 07 Apr 2017)
Log Message:
-----------
more on helpdesk
Modified Paths:
--------------
trunk/helpdesk/inc/class.uitts.inc.php
trunk/phpgwapi/inc/class.historylog.inc.php
trunk/property/inc/class.historylog.inc.php
trunk/property/inc/class.uigallery.inc.php
Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php 2017-04-07 08:25:27 UTC (rev
16555)
+++ trunk/helpdesk/inc/class.uitts.inc.php 2017-04-07 11:59:07 UTC (rev
16556)
@@ -1724,7 +1724,7 @@
foreach ($additional_notes as &$note)
{
- $note['value_note'] =
htmlentities(nl2br($note['value_note']));
+ $note['value_note'] =
nl2br($note['value_note']);
}
$datatable_def = array();
Modified: trunk/phpgwapi/inc/class.historylog.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.historylog.inc.php 2017-04-07 08:25:27 UTC (rev
16555)
+++ trunk/phpgwapi/inc/class.historylog.inc.php 2017-04-07 11:59:07 UTC (rev
16556)
@@ -121,8 +121,8 @@
'owner' =>
$GLOBALS['phpgw']->accounts->id2name($this->db->f('history_owner')),
// 'status' =>
lang($this->types[$this->db->f('history_status')]),
'status' => str_replace('
','',$this->db->f('history_status')),
- 'new_value' =>
htmlspecialchars_decode($this->db->f('history_new_value',true)),
- 'old_value' =>
htmlspecialchars_decode($this->db->f('history_old_value',true)),
+ 'new_value' =>
$this->db->f('history_new_value',true),
+ 'old_value' =>
$this->db->f('history_old_value',true),
'datetime' =>
$this->db->from_timestamp($this->db->f('history_timestamp')),
'publish' =>
$this->db->f('publish')
);
Modified: trunk/property/inc/class.historylog.inc.php
===================================================================
--- trunk/property/inc/class.historylog.inc.php 2017-04-07 08:25:27 UTC (rev
16555)
+++ trunk/property/inc/class.historylog.inc.php 2017-04-07 11:59:07 UTC (rev
16556)
@@ -275,7 +275,6 @@
'id' => $this->db->f('history_id'),
'record_id' =>
$this->db->f('history_record_id'),
'owner' =>
$GLOBALS['phpgw']->accounts->id2name($this->db->f('history_owner')),
- //
'status' => lang($this->types[$this->db->f('history_status')]),
'status' => preg_replace('/ /', '',
$this->db->f('history_status')),
'new_value' =>
$this->db->f('history_new_value', true),
'old_value' =>
$this->db->f('history_old_value', true),
Modified: trunk/property/inc/class.uigallery.inc.php
===================================================================
--- trunk/property/inc/class.uigallery.inc.php 2017-04-07 08:25:27 UTC (rev
16555)
+++ trunk/property/inc/class.uigallery.inc.php 2017-04-07 11:59:07 UTC (rev
16556)
@@ -54,7 +54,6 @@
{
parent::__construct();
- $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bo = CreateObject('property.bogallery', true);
$this->bocommon = CreateObject('property.bocommon');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16556] more on helpdesk,
sigurdne <=