Author: ralfbecker
New Revision: 55874
URL: http://svn.stylite.de/viewvc/egroupware?rev=55874&view=rev
Log:
- Wiki/PostgreSQL: fix SQL error while searching
Modified:
trunk/wiki/ (props changed)
trunk/wiki/inc/class.wiki_so.inc.php
trunk/wiki/lang/ (props changed)
Propchange: trunk/wiki/
svn:mergeinfo = /branches/14.2/wiki:55873
— trunk/wiki/inc/class.wiki_so.inc.php (original)
+++ trunk/wiki/inc/class.wiki_so.inc.php Wed Apr 27 10:31:12 2016
@@ -505,7 +505,7 @@
" FROM $this->PgTbl AS t1, (select wiki_id,wiki_lang,wiki_name, max(wiki_version) as wiki_version from $this->PgTbl GROUP BY wiki_id, wiki_lang, wiki_name) AS t2".
" WHERE t1.wiki_name=t2.wiki_name AND t1.wiki_lang=t2.wiki_lang AND t1.wiki_id=$this->wiki_id AND t2.wiki_id=$this->wiki_id".
" AND ".$sowikipage->acl_filter(true,false,‘t1’). // only include pages we are allowed to read!
-
" GROUP BY t1.wiki_name,t1.wiki_lang,t1.wiki_version,t1.wiki_title,t1.wiki_body".
-
" GROUP BY t1.wiki_name,t1.wiki_lang,t1.wiki_version,t1.wiki_title,t1.wiki_body,t1.wiki_comment".
" HAVING t1.wiki_version=MAX(t2.wiki_version) AND (";
$search_in = $search_in ? explode(',',$_search_in) : array('t1.wiki_name','t1.wiki_title','t1.wiki_body','t1.wiki_comment');
Propchange: trunk/wiki/lang/
— svn:ignore (original)
+++ svn:ignore Wed Apr 27 10:31:12 2016
@@ -34,3 +34,4 @@
egw_vi.lang.old
egw_zh-tw.lang.old
egw_zh.lang.old
+egw_en.lang.old
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs