diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2017-05-18 18:10:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 18:10:32 +0200 |
| commit | 6c20c42d1ba56badd9192f4d3fa9afbdd2b71de1 (patch) | |
| tree | 1eb00601e9a9de51650220c3085feaf715565807 | |
| parent | d41fd7471c05ccaff14d13ed1a8d721dc363b8b0 (diff) | |
| parent | fad02fe00c88010739ad769c4f46199c5c462e07 (diff) | |
| download | nextcloud-server-6c20c42d1ba56badd9192f4d3fa9afbdd2b71de1.tar.gz nextcloud-server-6c20c42d1ba56badd9192f4d3fa9afbdd2b71de1.zip | |
Merge pull request #4939 from nextcloud/add-share-name-column
Add the column so we keep the value from before the update
| -rw-r--r-- | apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php | 3 | ||||
| -rw-r--r-- | db_structure.xml | 8 | ||||
| -rw-r--r-- | version.php | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index 512000181c1..aa3411ecb16 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -381,7 +381,8 @@ class RequestHandlerControllerTest extends TestCase { 'accepted' => '0', 'expiration' => null, 'password' => null, - 'mail_send' => '0' + 'mail_send' => '0', + 'share_name' => null, ]; $searchToken = $correctToken ? 'token' : 'wrongToken'; diff --git a/db_structure.xml b/db_structure.xml index d6eba8b3713..583e9bb8522 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -922,6 +922,14 @@ <length>1</length> </field> + <field> + <name>share_name</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>64</length> + </field> + <index> <name>item_share_type_index</name> <field> diff --git a/version.php b/version.php index eb6254a777f..37e15f35e1f 100644 --- a/version.php +++ b/version.php @@ -26,7 +26,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(12, 0, 0, 21); +$OC_Version = array(12, 0, 0, 22); // The human readable string $OC_VersionString = '12.0 beta 4'; |