diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-28 10:39:23 -0500 |
| commit | b5989c933f3c51887724d89e989a3e2af4207d6e (patch) | |
| tree | 40677bfa8daa1357b1ca3a561b551a142cbe6c82 /apps/files_sharing/appinfo | |
| parent | ea83acedebbcf70b19643efe82b72fb139cf8ad2 (diff) | |
| parent | 93e713d3781c5d5fc6d0dbb6c6a0a8f9c2e15b97 (diff) | |
| download | nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.tar.gz nextcloud-server-b5989c933f3c51887724d89e989a3e2af4207d6e.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/update.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 1f24a4dde83..9a199281a76 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -5,7 +5,7 @@ <description>File sharing between users</description> <licence>AGPL</licence> <author>Michael Gapczynski</author> - <require>4.91</require> + <require>4.93</require> <shipped>true</shipped> <default_enable/> <types> diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 1d22b32b503..48e41e93048 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) { } catch (Exception $e) { $update_error = true; - OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN); + OCP\Util::writeLog('files_sharing', + 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith + .'" (error is "'.$e->getMessage().'")', + OCP\Util::WARN); } OC_Util::tearDownFS(); } |