Merge branch '2.4.2' into lexer2

src/Config.cpp

@@ -368,7 +368,7 @@ std::string Config::_defaults =
   "report.list.labels=ID,Active,Age,D,P,Project,Tags,R,Sch,Due,Until,Description,Urg\n"
   "report.list.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due,until.remaining,description.count,urgency\n"
   "report.list.filter=status:pending\n"
-  "report.list.sort=start-,due+,project+/,urgency-\n"
+  "report.list.sort=start-,due+,project+,urgency-\n"
   "\n"
   "report.ls.description=Few details of tasks\n"
   "report.ls.labels=ID,A,D,Project,Tags,R,Wait,S,Due,Until,Description\n"

src/DOM.cpp

@@ -313,7 +313,7 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
           Column* column = context.columns[canonical];
           if (column)
           {
-            if (column->is_uda () && ! task.has (canonical))
+            if (column->is_uda () && ! ref.has (canonical))
             {
               value = Variant ("''");
               return true;