[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17041] Stable: Merge 17038:17040 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17041] Stable: Merge 17038:17040 from trunk |
|
Date: |
Fri, 8 Sep 2017 03:44:47 -0400 (EDT) |
Revision: 17041
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17041
Author: sigurdne
Date: 2017-09-08 03:44:46 -0400 (Fri, 08 Sep 2017)
Log Message:
-----------
Stable: Merge 17038:17040 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-2_0-branch/controller/inc/class.soprocedure.inc.php
branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-2_0-branch/controller/templates/base/procedure/print_procedure.xsl
branches/Version-2_0-branch/eventplanner/inc/class.soapplication.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch 2017-09-08 07:44:46 UTC (rev 17041)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037
\ No newline at end of property
+/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,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/booking 2017-09-08 07:44:46 UTC (rev 17041)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847,16883,16885,16908-16909,16939-16942,16944,16946,16948,17020-17023,17028-17033,17039-17040
\ No newline at end of property
Modified: branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/booking/inc/class.socommon.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -168,7 +168,7 @@
return
"{$params['join']['table']}_{$params['join']['column']}_{$field}";
}
- public function _get_cols_and_joins( $filters = array() )
+ public function _get_cols_and_joins( $query = '', $filters =
array() )
{
$cols = array();
$joins = array();
@@ -181,7 +181,7 @@
}
else if (isset($params['join']) &&
$params['join'])
{
- if ($params['join_type'] ==
'manytomany' && !isset($filters[$field]) && !$filters[$field])
+ if ($params['join_type'] ==
'manytomany' && ( empty($filters[$field]) && empty($query) ) )
{
continue;
}
@@ -499,7 +499,7 @@
$dir = isset($params['dir']) && $params['dir'] ?
$params['dir'] : 'asc';
$query = isset($params['query']) && $params['query'] ?
$params['query'] : null;
$filters = isset($params['filters']) &&
$params['filters'] ? $params['filters'] : array();
- $cols_joins = $this->_get_cols_and_joins($filters);
+ $cols_joins = $this->_get_cols_and_joins($query,
$filters);
$cols = join(',', $cols_joins[0]);
$joins = join(' ', $cols_joins[1]);
$condition = $this->_get_conditions($query, $filters);
Modified: branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/controller/inc/class.socontrol.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -95,7 +95,7 @@
'description = ' .
$this->marshal($control->get_description(), 'string'),
'start_date = ' .
$this->marshal($control->get_start_date(), 'int'),
'end_date = ' .
$this->marshal($control->get_end_date(), 'int'),
- 'control_area_id = ' .
$this->marshal($control->get_control_area_id()),
+ 'control_area_id = ' .
$this->marshal($control->get_control_area_id(), 'int'),
'repeat_type = ' .
$this->marshal($control->get_repeat_type(), 'string'),
'repeat_interval = ' .
$this->marshal($control->get_repeat_interval(), 'string'),
'procedure_id = ' .
$this->marshal($control->get_procedure_id(), 'int'),
Modified: branches/Version-2_0-branch/controller/inc/class.soprocedure.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.soprocedure.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/controller/inc/class.soprocedure.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -514,6 +514,7 @@
$results = array();
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$sql = "SELECT p.* FROM controller_procedure p WHERE
{$revision_filter} ORDER BY end_date ASC";
$this->db->query($sql, __LINE__, __FILE__);
@@ -526,11 +527,14 @@
$procedure->set_description($this->unmarshal($this->db->f('description', true),
'string'));
$procedure->set_reference($this->unmarshal($this->db->f('reference', true),
'string'));
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true),
'string'));
-
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('start_date'), 'int')));
-
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('end_date'), 'int')));
+
$procedure->set_start_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('start_date'),
'int'), $dateformat));
+ //
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('start_date'), 'int')));
+ //
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('end_date'), 'int')));
+
$procedure->set_end_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('end_date'),
'int'), $dateformat));
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
-
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('revision_date'), 'int')));
+ //
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('revision_date'), 'int')));
+
$procedure->set_revision_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('revision_date'),
'int'), $dateformat));
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category_name = $category[0]['name']);
Modified: branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -57,6 +57,7 @@
'print_procedure' => true
);
+ protected $dateformat;
public function __construct()
{
parent::__construct();
@@ -76,6 +77,7 @@
$config = CreateObject('phpgwapi.config', 'controller');
$config->read();
$this->_category_acl =
isset($config->config_data['acl_at_control_area']) &&
$config->config_data['acl_at_control_area'] == 1 ? true : false;
+ $this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
@@ -443,8 +445,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
$GLOBALS['phpgw']->jqcal->add_listener('revision_date');
- $end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date() ? $procedure->get_end_date() : '');
- $revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date() ? $procedure->get_revision_date() : '');
+ $end_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_end_date(), $dateformat);
+ $revision_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_revision_date(),
$dateformat);
$data = array
@@ -452,7 +454,7 @@
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, 'procedure', 'procedure_tabview'),
'view' => "view_procedure",
'value_id' => !empty($procedure) ?
$procedure->get_id() : 0,
- 'start_date' =>
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date() ? $procedure->get_start_date() : time()),
+ 'start_date' =>
$GLOBALS['phpgw']->common->show_date($procedure->get_start_date() ?
$procedure->get_start_date() : time(), $dateformat),
'end_date' => $end_date ? $end_date :
'',
'revision_date' => $revision_date ?
$revision_date : '',
'editable' => true,
@@ -539,8 +541,8 @@
if ($procedure->get_start_date() &&
$procedure->get_start_date() != null)
{
- //$procedure_start_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date());
-
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date()));
+ //$procedure_start_date =
date($this->dateformat, $procedure->get_start_date());
+
$procedure->set_start_date(date($this->dateformat,
$procedure->get_start_date()));
}
else
{
@@ -548,8 +550,8 @@
}
if ($procedure->get_end_date() &&
$procedure->get_end_date() != null)
{
- //$procedure_end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date());
-
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date()));
+ //$procedure_end_date =
date($this->dateformat, $procedure->get_end_date());
+
$procedure->set_end_date(date($this->dateformat, $procedure->get_end_date()));
}
else
{
@@ -557,8 +559,8 @@
}
if ($procedure->get_revision_date() &&
$procedure->get_revision_date() != null)
{
- //$procedure_revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date());
-
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date()));
+ //$procedure_revision_date =
date($this->dateformat, $procedure->get_revision_date());
+
$procedure->set_revision_date(date($this->dateformat,
$procedure->get_revision_date()));
}
else
{
@@ -674,7 +676,7 @@
'location' => $location_array,
'control' => $control->toArray(),
'procedure' => $procedure->toArray(),
- 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
+ 'dateformat' => $this->dateformat
);
//var_dump($procedure->toArray());
Modified:
branches/Version-2_0-branch/controller/templates/base/procedure/print_procedure.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/procedure/print_procedure.xsl
2017-09-08 07:43:40 UTC (rev 17040)
+++
branches/Version-2_0-branch/controller/templates/base/procedure/print_procedure.xsl
2017-09-08 07:44:46 UTC (rev 17041)
@@ -42,7 +42,6 @@
<h4>
<xsl:value-of
select="php:function('lang','Procedure end date')" />
</h4>
- <xsl:value-of
select="procedure/end_date" />
<xsl:variable name="enddate">
<xsl:value-of
select="procedure/end_date" />
</xsl:variable>
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.soapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.soapplication.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/eventplanner/inc/class.soapplication.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -56,9 +56,9 @@
return self::$so;
}
- public function _get_cols_and_joins( $filters = array() )
+ public function _get_cols_and_joins( $query = '', $filters =
array() )
{
- $cols_joins = parent::_get_cols_and_joins($filters);
+ $cols_joins = parent::_get_cols_and_joins($query,
$filters);
$cols = $cols_joins[0];
$joins = $cols_joins[1];
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-09-08 07:43:40 UTC (rev 17040)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-09-08 07:44:46 UTC (rev 17041)
@@ -215,7 +215,7 @@
$filters = isset($params['filters']) &&
$params['filters'] ? $params['filters'] : array();
$relaxe_acl = isset($params['relaxe_acl']) &&
$params['relaxe_acl'] ? $params['relaxe_acl'] : false;
$this->relaxe_acl = $relaxe_acl;
- $cols_joins = $this->_get_cols_and_joins($filters);
+ $cols_joins = $this->_get_cols_and_joins($query,
$filters);
$cols = join(',', $cols_joins[0]);
$joins = join(' ', $cols_joins[1]);
$condition = $this->_get_conditions($query, $filters);
@@ -638,7 +638,7 @@
return
"{$params['join']['table']}_{$params['join']['column']}_{$field}";
}
- public function _get_cols_and_joins( $filters = array() )
+ public function _get_cols_and_joins( $query = '', $filters =
array() )
{
$cols = array();
$joins = array();
@@ -655,7 +655,7 @@
}
else if (isset($params['join']) &&
$params['join'])
{
- if ($params['join_type'] ==
'manytomany' && !isset($filters[$field]) && !$filters[$field])
+ if ($params['join_type'] ==
'manytomany' && ( empty($filters[$field]) && empty($query) ) )
{
continue;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17041] Stable: Merge 17038:17040 from trunk,
sigurdne <=