Merge branch 'MDL-70941-master' of git://github.com/dravek/moodle

abgreeve · Mar 1, 2021 · bd2efca · bd2efca
2 parents 537905a + 9b8c45e
commit bd2efca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/contentbank/classes/content.php b/contentbank/classes/content.php
@@ -151,7 +151,7 @@ public function update_content(): bool {
      */
     public function set_name(string $name): bool {
         $name = trim($name);
-        if (empty($name)) {
+        if ($name === '') {
             return false;
         }
 

diff --git a/contentbank/classes/external/rename_content.php b/contentbank/classes/external/rename_content.php
@@ -79,7 +79,7 @@ public static function execute(int $contentid, string $name): array {
         $params['name'] = clean_param($params['name'], PARAM_TEXT);
 
         // If name is empty don't try to rename and return a more detailed message.
-        if (empty(trim($params['name']))) {
+        if (trim($params['name']) === '') {
             $warnings[] = [
                 'item' => $params['contentid'],
                 'warningcode' => 'emptynamenotallowed',

diff --git a/contentbank/tests/contenttype_test.php b/contentbank/tests/contenttype_test.php
@@ -464,6 +464,7 @@ public function rename_content_provider() {
             'Too long name' => [str_repeat('a', 300), str_repeat('a', 255), true],
             'Empty name' => ['', 'Test content ', false],
             'Blanks only' => ['  ', 'Test content ', false],
+            'Zero name' => ['0', '0', true],
         ];
     }
 

diff --git a/contentbank/tests/external/rename_content_test.php b/contentbank/tests/external/rename_content_test.php
@@ -60,6 +60,7 @@ public function rename_content_provider() {
             'Too long name' => [str_repeat('a', 300), str_repeat('a', 255), true],
             'Empty name' => ['', 'Test content ', false],
             'Blanks only' => ['  ', 'Test content ', false],
+            'Zero name' => ['0', '0', true],
         ];
     }