[eGroupWare-svn] r52620 - in /branches/14.2/phpgwapi: ./ inc/class.historylog.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Sat Apr 25 12:08:41 2015
New Revision: 52620

URL: http://svn.stylite.de/viewvc/egroupware?rev=52620&view=rev
Log:
* PostgreSQL: fix SQL error viewing history of an entry containing attachments

Modified:
    branches/14.2/phpgwapi/   (props changed)
    branches/14.2/phpgwapi/inc/class.historylog.inc.php

Propchange: branches/14.2/phpgwapi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 25 12:08:41 2015
@@ -1,1 +1,1 @@
-/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52501,52532,52534,52579,52588,52596,52598,52604,52608
+/trunk/phpgwapi:51366,51376,51397,51419,51437,51453-51454,51479,51503,51512,51518,51521-51522,51526-51528,51530,51539,51556,51562,51577,51579,51588-51589,51612,51626,51701,51716-51717,51721,51758,51762-51763,51768,51775,51779,51785,51800,51810,51812,51817,51824,51839,51855,51870,51881-51882,51886,51905,51909,51918,51973,51975,51977,51988,52007,52016,52054,52057,52059,52062,52088,52099,52107-52108,52132,52147,52149,52165,52177,52179,52199,52220,52238,52241,52252,52268,52274,52283,52288-52289,52296,52301,52310,52312,52314,52316,52322-52323,52327,52332,52334,52341,52368-52372,52375,52399,52428,52457,52501,52532,52534,52579,52588,52596,52598,52604,52608,52619

Modified: branches/14.2/phpgwapi/inc/class.historylog.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/phpgwapi/inc/class.historylog.inc.php?rev=52620&r1=52619&r2=52620&view=diff
==============================================================================
--- branches/14.2/phpgwapi/inc/class.historylog.inc.php (original)
+++ branches/14.2/phpgwapi/inc/class.historylog.inc.php Sat Apr 25 12:08:41 2015
@@ -235,7 +235,7 @@
 		{
 			$_query[] = array(
 				'table' => sqlfs_stream_wrapper::TABLE,
-				'cols' =>array('fs_id', 'fs_dir', '"filemanager"','COALESCE(fs_modifier,fs_creator)','"~file~"','fs_name','fs_modified', 'fs_mime'),
+				'cols' =>array('fs_id', 'fs_dir', "'filemanager'",'COALESCE(fs_modifier,fs_creator)',"'~file~'",'fs_name','fs_modified', 'fs_mime'),
 				'where' => array('fs_dir' => $file['ino'])
 			);
 		}