Merge branch 'patch-1' of github.com:Atry/phpjs into Atry-patch-1

kvz · kvz · commit d4f2f794ad85 · 2014-03-04T15:11:29.000+01:00
Conflicts:
	functions/xml/utf8_encode.js
diff --git a/functions/xml/utf8_encode.js b/functions/xml/utf8_encode.js
@@ -34,16 +34,16 @@ function utf8_encode(argString) {
       enc = String.fromCharCode(
         (c1 >> 6) | 192, (c1 & 63) | 128
       );
-    } else if (c1 & 0xF800 != 0xD800) {
+    } else if ((c1 & 0xF800) != 0xD800) {
       enc = String.fromCharCode(
         (c1 >> 12) | 224, ((c1 >> 6) & 63) | 128, (c1 & 63) | 128
       );
     } else { // surrogate pairs
-      if (c1 & 0xFC00 != 0xD800) {
+      if ((c1 & 0xFC00) != 0xD800) {
         throw new RangeError('Unmatched trail surrogate at ' + n);
       }
       var c2 = string.charCodeAt(++n);
-      if (c2 & 0xFC00 != 0xDC00) {
+      if ((c2 & 0xFC00) != 0xDC00) {
         throw new RangeError('Unmatched lead surrogate at ' + (n - 1));
       }
       c1 = ((c1 & 0x3FF) << 10) + (c2 & 0x3FF) + 0x10000;
@@ -65,4 +65,4 @@ function utf8_encode(argString) {
   }
 
   return utftext;
-}
+}
