Adding defense checking for msgs.

jmturner · Mar 21, 2020 · 93919b3 · 93919b3
1 parent c47f945
commit 93919b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 59 deletions.
diff --git a/owa_base.php b/owa_base.php
@@ -90,20 +90,25 @@ function getMsg($code, $substitutions = []) {
 
 		static $_owa_messages;
 
+		$msg = array();
+
 		if (empty($_owa_messages)) {
 			require_once(OWA_DIR.'conf/messages.php');
 		}
+
+		if ( $code && array_key_exists( $code, $_owa_messages ) ) {
+
+			$msg = $_owa_messages[$code];
 
-		$msg = $_owa_messages[$code];
-
-		if (isset($msg['headline'])) {
-            $msg['headline'] = vsprintf($msg['headline'], $substitutions['headline']);
-        }
-
-        if (isset($msg['message'])) {
-            $msg['message'] = vsprintf($msg['message'], $substitutions['message']);
-        }
-
+			if (isset($msg['headline'])) {
+	            $msg['headline'] = vsprintf($msg['headline'], $substitutions['headline']);
+	        }
+
+	        if (isset($msg['message'])) {
+	            $msg['message'] = vsprintf($msg['message'], $substitutions['message']);
+	        }
+		}
+
 		return $msg;
 	}
 

diff --git a/owa_wp.php b/owa_wp.php