fix array methods to match es6

Yamaha32088 · Jun 13, 2018 · 7ee5bdc · 7ee5bdc
1 parent 0d36fe7
commit 7ee5bdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.number b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Jun 11 15:42:43 CDT 2018
-build.number=14
+#Wed Jun 13 13:59:59 CDT 2018
+build.number=15
diff --git a/source/java/src/com/squidfoundry/array/ArrayPop.java b/source/java/src/com/squidfoundry/array/ArrayPop.java
@@ -14,10 +14,10 @@ public class ArrayPop extends BIF implements Function {
 	private static final long serialVersionUID = 849213838350625616L;
 
 	public static Object call(Array arrayToPop) throws PageException {
-		if(arrayToPop.size() > 1) { 
+		if(arrayToPop.size() > 0) { 
 			return arrayToPop.removeE(arrayToPop.size());
 		}
-		return arrayToPop;
+		return null;
 	}
 
 	@Override

diff --git a/source/java/src/com/squidfoundry/array/ArrayShift.java b/source/java/src/com/squidfoundry/array/ArrayShift.java
@@ -17,7 +17,7 @@ public static Object call(Array arrayToShift) throws PageException {
 		if(arrayToShift.size() > 0) {
 			return arrayToShift.removeE(1);
 		}
-		return arrayToShift;
+		return null;
 	}
 
 	@Override