summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Bertolin <sbertolin@solidgear.es>2016-11-23 12:02:09 +0000
committerLukas Reschke <lukas@statuscode.ch>2016-12-22 12:49:49 +0100
commit02de82df91910ad8f206f379a5eeaee9fb332b74 (patch)
tree26e406e9a80fbdc1de9293ad218283c0d3165890
parentb78dcae1d491be99ec6dffa6705b2c987cb1393b (diff)
downloadnextcloud-server-02de82df91910ad8f206f379a5eeaee9fb332b74.tar.gz
nextcloud-server-02de82df91910ad8f206f379a5eeaee9fb332b74.zip
Fixed failing problems
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
-rw-r--r--build/integration/features/bootstrap/WebDav.php8
-rw-r--r--build/integration/features/favorites.feature2
2 files changed, 5 insertions, 5 deletions
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index f19ae1a86ef..9cb9d4a3048 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -410,7 +410,7 @@ trait WebDav {
public function reportFolder($user, $path, $properties = null){
$client = $this->getSabreClient($user);
- $body = [ 'body' => '<?xml version="1.0" encoding="utf-8" ?>
+ $body = '<?xml version="1.0" encoding="utf-8" ?>
<oc:filter-files xmlns:a="DAV:" xmlns:oc="http://owncloud.org/ns" >
<a:prop>
<oc:id/>
@@ -433,11 +433,11 @@ trait WebDav {
<oc:filter-rules>
<oc:favorite>1</oc:favorite>
</oc:filter-rules>
- </oc:filter-files>'];
+ </oc:filter-files>';
$response = $client->request('REPORT', $this->makeSabrePath($user, $path), $body);
-
- return $response;
+ $parsedResponse = $client->parseMultistatus($response['body']);
+ return $parsedResponse;
}
public function makeSabrePath($user, $path) {
diff --git a/build/integration/features/favorites.feature b/build/integration/features/favorites.feature
index a2ee579436e..c00ed05eefe 100644
--- a/build/integration/features/favorites.feature
+++ b/build/integration/features/favorites.feature
@@ -86,7 +86,7 @@ Feature: favorite
And user "user0" favorites element "/textfile0.txt"
And user "user0" favorites element "/textfile1.txt"
Then user "user0" in folder "/" should have favorited the following elements
- | /FOLDER |
+ | /FOLDER |
| /textfile0.txt |
| /textfile1.txt |
pan> "Second-factor backup codes" : "Резервен код за втората стъпка", "Generate backup codes" : "Генериране на резервни кодове", "Backup code" : "Резервен код", "Use backup code" : "Използвай код за възстановяване", "Backup codes have been generated. {used} of {total} codes have been used." : "Резервен код е бил генериран. Използвани са {used} от {total} кода.", "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Това е вашия резервен код. Моля, запишете го (или го принтирайте) защото по-късно няма да имате възможност да го видите.", "Save backup codes" : "Записване на резервния код", "Print backup codes" : "Принтиране на резервния код", "Regenerate backup codes" : "Регенериране на резервния код", "If you regenerate backup codes, you automatically invalidate old codes." : "При регенерирането на резервния код, стария код автоматично бива анулиран.", "An error occurred while generating your backup codes" : "Възникна грешка при генерирането на резервния код", "Submit" : "Изпращане", "_" : "_", "You have enabled two-factor authentication but have not yet generated backup codes. Be sure to do this in case you lose access to your second factor." : "Включили сте двустепенното удостоверяването, но не сте създали резервен код. Моля, създайте резервен код, който да ползвате когато загубите достъп до устройството генериращо кода за втората стъпка в удостоверяването." }, "nplurals=2; plural=(n != 1);");