diff --git a/inc/panel.class.php b/inc/panel.class.php
index 531b8e4..d6ffc2d 100644
--- a/inc/panel.class.php
+++ b/inc/panel.class.php
@@ -249,7 +249,7 @@ class panel {
 			return $text;
 		}
 
-		if(strstr($option,"wysiwyg")){
+		if(str_contains($option, "wysiwyg")){
 			$string=str_replace("wysiwyg(","",substr($option, 0, -1));
 			$sarr=explode(";",$string);
 			foreach($sarr as $str){
@@ -265,32 +265,34 @@ class panel {
 			return $text;
 		}
 
-		if(strstr($option,"textarea")){
+		if(str_contains($option, "textarea")){
 			$string=str_replace("textarea(","",substr($option, 0, -1));
 			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$a_name[]=$substr[0];
-				$value[]=$substr[1];
-			}
-			if(is_array($sarr)){
+			if(count($sarr)>1) {
+				foreach ($sarr as $str) {
+					$substr = explode("|", $str);
+					$a_name[] = $substr[0];
+					$value[] = $substr[1];
+				}
 				$text=$this->textarea(array("name"=>$name,"value"=>$value, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"",TRUE);
 			}else{
 				$text=$this->textarea(array("name"=>$name,"value"=>$value),"",TRUE);
 			}
 			return $text;
+
 		}
 
-		if(strstr($option,"select")){
-			//$text=$panel->field("text",$name,"value=\"".$config[$name]."\"",TRUE);
+		if(str_contains($option, "select")){
 			$string=str_replace("select(","",substr($option, 0, -1));
 			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$values[$substr[0]]=$substr[1];
+			$values=array();
+			if(count($sarr)>1) {
+				foreach ($sarr as $str) {
+					$substr = explode("|", $str);
+					$values[$substr[0]] = $substr[1];
+				}
 			}
-			$select=$this->select($values,$value,$name,"",TRUE);
-			return $select;
+			return $this->select($values,$value,$name,"",TRUE);
 		}
 
 	}