[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15620] Stable: Merge 15618:15619 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15620] Stable: Merge 15618:15619 from trunk |
Date: |
Thu, 8 Sep 2016 09:25:50 +0000 (UTC) |
Revision: 15620
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15620
Author: sigurdne
Date: 2016-09-08 09:25:49 +0000 (Thu, 08 Sep 2016)
Log Message:
-----------
Stable: Merge 15618:15619 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.solocation.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619
Modified: branches/Version-2_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.solocation.inc.php
2016-09-08 09:24:35 UTC (rev 15619)
+++ branches/Version-2_0-branch/property/inc/class.solocation.inc.php
2016-09-08 09:25:49 UTC (rev 15620)
@@ -289,13 +289,13 @@
{
$sql = "SELECT * FROM phpgw_cust_attribute "
. " WHERE location_id = {$location_id}"
- . " AND custom = 1 OR column_name = 'category'";
+ . " AND (custom = 1 OR column_name =
'category')";
$this->db->query($sql, __LINE__, __FILE__);
+ $attribs = array();
while ($this->db->next_record())
{
- $attribs = array();
$id = $this->db->f('id');
$attribs[$id] = array
(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15620] Stable: Merge 15618:15619 from trunk,
sigurdne <=