fix(Handlebars): "or" helper returns first truthy value

cppalliance · Nov 21, 2024 · f9e7af4 · f9e7af4
1 parent 29f4d4f
commit f9e7af4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/include/mrdocs/Support/Handlebars.hpp b/include/mrdocs/Support/Handlebars.hpp
@@ -1117,7 +1117,7 @@ and_fn(dom::Array const& args);
  *  The "or" helper returns true if any of the values are truthy.
  */
 MRDOCS_DECL
-bool
+dom::Value
 or_fn(dom::Array const& args);
 
 /** "eq" helper function

diff --git a/src/lib/Support/Handlebars.cpp b/src/lib/Support/Handlebars.cpp
@@ -3934,15 +3934,19 @@ and_fn(dom::Array const& args)
     return true;
 }
 
-bool
-or_fn(dom::Array const& args) {
+dom::Value
+or_fn(dom::Array const& args)
+{
     std::size_t const n = args.size();
-    if (n == 0) return false;
+    if (n == 0)
+    {
+        return false;
+    }
     for (std::size_t i = 0; i < n - 1; ++i)
     {
         if (args.get(i))
         {
-            return true;
+            return args.get(i);
         }
     }
     return false;