--- loncom/lonnet/perl/lonnet.pm	2014/02/23 20:53:03	1.1250
+++ loncom/lonnet/perl/lonnet.pm	2014/03/09 15:39:04	1.1252
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1250 2014/02/23 20:53:03 raeburn Exp $
+# $Id: lonnet.pm,v 1.1252 2014/03/09 15:39:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5338,8 +5338,8 @@ sub role_status {
     if (exists($env{$rolekey}) && $env{$rolekey} ne '') {
         my ($one,$two) = split(m{\./},$rolekey,2);
         (undef,undef,$$role) = split(/\./,$one,3);
-        $$where = '/'.$two;
         unless (!defined($$role) || $$role eq '') {
+            $$where = '/'.$two;
             $$trolecode=$$role.'.'.$$where;
             ($$tstart,$$tend)=split(/\./,$env{$rolekey});
             $$tstatus='is';
@@ -5545,11 +5545,11 @@ sub unserialize {
     return {} if $rep =~ /^error/;
 
     my %returnhash=();
-	foreach my $item (split /\&/, $rep) {
+	foreach my $item (split(/\&/,$rep)) {
 	    my ($key, $value) = split(/=/, $item, 2);
 	    $key = unescape($key) unless $escapedkeys;
 	    next if $key =~ /^error: 2 /;
-	    $returnhash{$key} = Apache::lonnet::thaw_unescape($value);
+	    $returnhash{$key} = &thaw_unescape($value);
 	}
     #return %returnhash;
     return \%returnhash;