Index: openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl 13 Jun 2018 11:39:24 -0000 1.26 +++ openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl 27 Jun 2018 16:38:25 -0000 1.27 @@ -280,10 +280,15 @@ -propstats:required {-propstatus true} } { +<<<<<<< 50-protocol-handler-procs.tcl + #my log "multiStatusResonse href $href propstats $propstats" + set encoded_href [string map {& & < < > >} [ns_urlencode -part path {*}[split $href /]]] +======= #:log "multiStatusResonse href $href propstats $propstats" +>>>>>>> 1.24 append reply \n \ {} \ - "\n$href\n" + "\n$encoded_href\n" # The multi-status respons has 2 formats # - with (used in PROPFIND and PROPPATCH) # - without (used in other cases, e.g. DELETE, COPY, MOVE for collections) @@ -311,6 +316,9 @@ } } append reply \n + + # ns_log notice "multiStatusResponse $reply" + return $reply } ProtocolHandler instproc multiStatusError {status} { Index: openacs-4/packages/xotcl-core/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/Attic/chat-procs.tcl,v diff -u -r1.31 -r1.32 --- openacs-4/packages/xotcl-core/tcl/chat-procs.tcl 12 Apr 2018 06:40:32 -0000 1.31 +++ openacs-4/packages/xotcl-core/tcl/chat-procs.tcl 27 Jun 2018 16:38:25 -0000 1.32 @@ -233,8 +233,11 @@ } Chat instproc user_name { user_id } { - acs_user::get -user_id $user_id -array user - return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}] + set screen_name [acs_user::get_user_info -user_id $user_id -element screen_name] + if {$screen_name eq ""} { + set screen_name [person::name -person_id $user_id] + } + return $screen_name } Chat instproc user_link { -user_id -color } {