Merge branch 'MDL-67035' of https://github.com/stronk7/moodle

mpetrowi · Nov 21, 2019 · e9b0505 · e9b0505
2 parents d7fc8bd + 6783adc
commit e9b0505
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
@@ -234,7 +234,7 @@ function block_blog_tags_sort($a, $b) {
     }
 
     if (is_numeric($a->$tagsort)) {
-        return ($a->$tagsort == $b->$tagsort) ? 0 : ($a->$tagsort > $b->$tagsort) ? 1 : -1;
+        return (($a->$tagsort == $b->$tagsort) ? 0 : ($a->$tagsort > $b->$tagsort)) ? 1 : -1;
     } elseif (is_string($a->$tagsort)) {
         return strcmp($a->$tagsort, $b->$tagsort); //TODO: this is not compatible with UTF-8!!
     } else {

diff --git a/tag/classes/collection.php b/tag/classes/collection.php
@@ -408,11 +408,11 @@ public static function cloud_sort($a, $b) {
         $tagsort = self::$cloudsortfield ?: 'name';
 
         if (is_numeric($a->$tagsort)) {
-            return ($a->$tagsort == $b->$tagsort) ? 0 : ($a->$tagsort > $b->$tagsort) ? 1 : -1;
+            return (($a->$tagsort == $b->$tagsort) ? 0 : ($a->$tagsort > $b->$tagsort)) ? 1 : -1;
         } else if (is_string($a->$tagsort)) {
             return strcmp($a->$tagsort, $b->$tagsort);
         } else {
             return 0;
         }
     }
-}
+}