diff --git a/classes/fORMRelated.php b/classes/fORMRelated.php index 068294b9..124a8c4a 100644 --- a/classes/fORMRelated.php +++ b/classes/fORMRelated.php @@ -225,14 +225,14 @@ static public function determineRequestFilter($class, $related_class, $route) $filter_table = $related_table; $filter_table_with_route = $related_table . '{' . $route_name . '}'; - $pk_field = $filter_table . '.' . $first_pk_column; - $pk_field_with_route = $filter_table_with_route . '.' . $first_pk_column; + $pk_field = $filter_table . '::' . $first_pk_column; + $pk_field_with_route = $filter_table_with_route . '::' . $first_pk_column; if (!fRequest::check($pk_field) && fRequest::check($pk_field_with_route)) { $filter_table = $filter_table_with_route; } - return $filter_table . '.'; + return $filter_table . '::'; } @@ -309,7 +309,7 @@ static public function linkRecords($class, &$related_records, $related_class, $r $relationship = fORMSchema::getRoute($table, $related_table, $route, 'many-to-many'); $field_table = $relationship['related_table']; - $field_column = '.' . $relationship['related_column']; + $field_column = '::' . $relationship['related_column']; $field = $field_table . $field_column; $field_with_route = $field_table . '{' . $route_name . '}' . $field_column; @@ -322,7 +322,7 @@ static public function linkRecords($class, &$related_records, $related_class, $r $record_set = fRecordSet::build( $related_class, array( - $field_with_route . '=' => fRequest::get($field, 'array', array()) + str_replace('::', '.', $field_with_route) . '=' => fRequest::get($field, 'array', array()) ) );