Merge branch 'master' into develop

2014-10-17 08:14:04 +11:00 · 2014-10-17 08:14:04 +11:00 · 6e827b4c8c
parent 6e584ecc56 c48e10cbf5
commit 6e827b4c8c
2 changed files with 3 additions and 3 deletions
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@ -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();
    }

-}
+}
--- a/modules/backend/formwidgets/DatePicker.php
+++ b/modules/backend/formwidgets/DatePicker.php
@ -92,4 +92,4 @@ class DatePicker extends FormWidgetBase
    {
        return strlen($value) ? $value : null;
    }
-}
+}