From 29d543293c2a4d6e8cef63974274d4056a028fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20Fr=C3=A2ncu?= Date: Wed, 11 Dec 2019 14:04:07 +0200 Subject: Fix argument order in call to join(). --- idiorm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idiorm.php b/idiorm.php index de7538a..2b1f38c 100644 --- a/idiorm.php +++ b/idiorm.php @@ -1355,7 +1355,7 @@ } } $query[] = "))"; - return $this->where_raw(join($query, ' '), $data); + return $this->where_raw(join(' ', $query), $data); } /** -- cgit v1.2.3 From 997a1e3ecd4afc9a0953e562e88905e45a79a5a3 Mon Sep 17 00:00:00 2001 From: Simon Holywell Date: Wed, 29 Apr 2020 10:33:16 +1000 Subject: Updates changelog and clarifies "feature complete" --- README.markdown | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 488c55d..eebb1a2 100644 --- a/README.markdown +++ b/README.markdown @@ -6,11 +6,11 @@ Idiorm [http://j4mie.github.com/idiormandparis/](http://j4mie.github.com/idiormandparis/) --- -### Feature complete +### Feature/API complete -Idiorm is now considered to be feature complete as of version 1.5.0. Whilst it will continue to be maintained with bug fixes there will be no further new features added from this point on. +Idiorm is now considered to be feature complete as of version 1.5.0. Whilst it will continue to be maintained with bug fixes there will be no further new features added from this point on. This means that if a pull request makes breaking changes to the API or requires anything other than a patch version bump of the library then it will not be merged. -**Please do not submit feature requests or pull requests adding new features as they will be closed without ceremony.** +**Please do not submit feature requests or API breaking changes as they will be closed without ceremony.** --- @@ -85,6 +85,11 @@ is a Docker setup in `./test/docker_for_php52` - check the readme in there for m Changelog --------- + +#### 1.5.7 - released 2020-04-29 + +* Fix argument order in call to join() [[CatalinFrancu](https://github.com/CatalinFrancu)] - [issue #357](https://github.com/j4mie/idiorm/pull/357) + #### 1.5.6 - released 2018-05-31 * Assign `null` to `self::$_db` on `reset_db()` to ensure PDO closes the connections [[bleakgadfly](https://github.com/bleakgadfly)] - [issue #338](https://github.com/j4mie/idiorm/issues/338) -- cgit v1.2.3