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

Attempted fix for a missing conditions/fields bug. The fix would probably have just been to use empty instead of isset, since apparently the defaults for these items are an empty string instead of null (yuck). However, I already had done a bit of minor logic change and prefer the new form, so that's why more than just the isset call was modified.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@363 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-22 22:54:02 +00:00
parent 1e359f816c
commit 030617713d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
models/behaviors/linkable.php
View File

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