[LON-CAPA-cvs] cvs: rat(version_2_10_X) / lonuserstate.pm

[raeburn]

raeburn		Thu Oct  6 23:30:06 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /rat	lonuserstate.pm 
  Log:
  - Backport 1.141.
  
  
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.137 rat/lonuserstate.pm:1.137.2.1
--- rat/lonuserstate.pm:1.137	Thu Apr 21 13:28:50 2011
+++ rat/lonuserstate.pm	Thu Oct  6 23:30:06 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.137 2011/04/21 13:28:50 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.137.2.1 2011/10/06 23:30:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -437,7 +437,7 @@
 # 8&8=8
     $expression=~s/([^_\.\d])([_\.\d]+)\&\2([^_\.\d])/$1$2$3/g;
 # 8|8=8
-    $expression=~s/([^_\.\d])([_\.\d]+)\|\2([^_\.\d])/$1$2$3/g;
+    $expression=~s/([^_\.\d])([_\.\d]+)(?:\|\2)+([^_\.\d])/$1$2$3/g;
 # (5&3)&4=5&3&4
     $expression=~s/\(([_\.\d]+)((?:\&[_\.\d]+)+)\)\&([_\.\d]+[^_\.\d])/$1$2\&$3/g;
 # (((5&3)|(4&6)))=((5&3)|(4&6))