mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Sam Georges 2014-10-17 08:14:04 +11:00
commit 6e827b4c8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/backend/behaviors/RelationController.php
View File

@ -414,7 +414,7 @@ class RelationController extends ControllerBehavior
*/
protected function findExistingRelationIds($checkIds = null)
{
$foreignKeyName = $this->relationModel->getKeyName();
$foreignKeyName = $this->relationModel->table . '.' . $this->relationModel->getKeyName();
$results = $this->relationObject
->getBaseQuery()
@ -818,4 +818,4 @@ class RelationController extends ControllerBehavior
return $this->sessionKey = FormHelper::getSessionKey();
}
}
}

2
modules/backend/formwidgets/Datepicker.php → modules/backend/formwidgets/DatePicker.php
View File

@ -92,4 +92,4 @@ class DatePicker extends FormWidgetBase
{
return strlen($value) ? $value : null;
}
}
}