abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Of course, the last fix didn't work... I don't know why it looked like it was working. This fix should resolve the issue.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@364 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-22 23:12:04 +00:00
parent 030617713d
commit 8db607ffc5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
models/behaviors/linkable.php
View File

@@ -259,12 +259,17 @@ class LinkableBehavior extends ModelBehavior {
// in either/or, but a couple should include BOTH the // in either/or, but a couple should include BOTH the
// options AND the association settings. // options AND the association settings.
foreach (array('fields', 'conditions') AS $fld) { foreach (array('fields', 'conditions') AS $fld) {
if (!empty($options[$fld]) && !is_array($options[$fld])) if (empty($options[$fld]))
$options[$fld] = array();
elseif (!is_array($options[$fld]))
$options[$fld] = array($options[$fld]); $options[$fld] = array($options[$fld]);
if (!empty($association[$fld]) && !is_array($association[$fld]))
if (empty($association[$fld]))
unset($association[$fld]);
elseif (!is_array($association[$fld]))
$association[$fld] = array($association[$fld]); $association[$fld] = array($association[$fld]);
if (!empty($options[$fld]) && !empty($association[$fld])) if (isset($options[$fld]) && isset($association[$fld]))
$options[$fld] = array_merge($options[$fld], $options[$fld] = array_merge($options[$fld],
$association[$fld]); $association[$fld]);
} }