diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2017-08-17 12:50:37 +0300 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2017-08-17 12:50:37 +0300 |
| commit | cb83ecca1d3ac3da19229a0851055728563dcbb8 (patch) | |
| tree | 8d99cf1038f41059053940a0828df0069c066b47 | |
| parent | 4e9d9d43221c8ad3573160aded149bd5dc6ff285 (diff) | |
0.12.4v0.12.4
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | appinfo/database.xml | 3 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | lib/Model/BaseMember.php | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ad97d87..64355085 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## 0.12.3 +## 0.12.4 - Fixing a migration bug. - Add Type to members. @@ -7,7 +7,7 @@ source_dir=$(build_dir)/source sign_dir=$(build_dir)/sign package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates -version+=0.12.3 +version+=0.12.4 all: appstore diff --git a/appinfo/database.xml b/appinfo/database.xml index ca2ab451..669f6113 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -149,9 +149,6 @@ <field> <name>user_id</name> </field> - <field> - <name>user_type</name> - </field> </index> </declaration> diff --git a/appinfo/info.xml b/appinfo/info.xml index 85e0b468..f7980ee3 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ Users won't be able to find this Circle using Nextcloud search engine. ]]> </description> - <version>0.12.3</version> + <version>0.12.4</version> <licence>agpl</licence> <author>Maxence Lange</author> <documentation> diff --git a/lib/Model/BaseMember.php b/lib/Model/BaseMember.php index 22885497..60b3f8c1 100644 --- a/lib/Model/BaseMember.php +++ b/lib/Model/BaseMember.php @@ -233,6 +233,10 @@ class BaseMember implements \JsonSerializable { * @return null|Member */ public static function fromArray($arr) { + if ($arr === null) { + return null; + } + $member = new Member(); $member->setCircleId($arr['circle_id']); $member->setLevel($arr['level']); |