[Mapbender-commits] r9254 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2015-07-14 02:43:56 -0700 (Tue, 14 Jul 2015)
New Revision: 9254

Modified:
   trunk/mapbender/http/php/mb_list_wmc_local_data.php
Log:
Fix for sql filter select

Modified: trunk/mapbender/http/php/mb_list_wmc_local_data.php
===================================================================
--- trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-07-14 09:17:16 UTC (rev 9253)
+++ trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-07-14 09:43:56 UTC (rev 9254)
@@ -34,9 +34,9 @@
 	$sql = 'select a.wmc_serial_id, a.wmc_local_data_public, a.wmc_title, a.wmc_timestamp, a.wmc_local_data_size,'.
        		' a.fkey_user_id, termsofuse.symbollink from mb_user_wmc a left join termsofuse on termsofuse.termsofuse_id'.
        		' = a.wmc_local_data_fkey_termsofuse_id where wmc_has_local_data = 1 and'.
-       		'(fkey_user_id = $1 or wmc_local_data_public = 1 or fkey_user_id in ('.
+       		'(fkey_user_id = $1 or (wmc_local_data_public = 1 AND fkey_user_id in ('.
 		'select mb_user_id from mb_user_mb_group inner join mb_user on mb_user_mb_group.fkey_mb_user_id = mb_user.mb_user_id where mb_user_mb_group.fkey_mb_group_id = '.$registratingGroupId.
-		'));';
+		')));';
 	$e = new mb_exception("sql: ".$sql);	
 } else {
 	$sql = 'select a.wmc_serial_id, a.wmc_local_data_public, a.wmc_title, a.wmc_timestamp, a.wmc_local_data_size,'.