Merge branch 'release/2.0.26' of https://github.com/ultimatemember/ultimatemember into release/2.0.26

includes/core/class-fields.php

@@ -2493,7 +2493,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					}
 
-					if( ! empty( $placeholder ) ) {
+					if ( ! empty( $placeholder ) && is_string( $placeholder ) ) {
 						$placeholder = strip_tags( $placeholder );
 					}
 

includes/core/class-files.php

@@ -39,7 +39,6 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 
 			$this->setup_paths();
 
-			//add_action( 'template_redirect', array( &$this, 'file_download' ) );
 			add_action( 'template_redirect', array( &$this, 'download_routing' ) );
 
 			$this->fonticon = array(
@@ -144,7 +143,6 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			}
 
 			$download_type = $field_data[ $field_key ]['type'];
-
 			if ( $download_type === 'file' ) {
 				$this->file_download( $user_id, $field_key, $field_value );
 			} else {

includes/core/class-mail.php

@@ -338,7 +338,15 @@ if ( ! class_exists( 'um\core\Mail' ) ) {
 
 			<?php } else {
 
-				echo $this->get_email_template( $slug, $args );
+				//strip tags in plain text email
+				//important don't use HTML in plain text emails!
+				$raw_email_template = $this->get_email_template( $slug, $args );
+				$plain_email_template = strip_tags( $raw_email_template );
+				if( $plain_email_template !== $raw_email_template ){
+					$plain_email_template = preg_replace( array('/&nbsp;/mi', '/^\s+/mi'), array(' ', ''), $plain_email_template );
+				}
+
+				echo $plain_email_template;
 
 			}
 

includes/core/class-profile.php

@@ -76,7 +76,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		/**
 		 * All tab data
 		 *
-		 * @return mixed|void
+		 * @return array
 		 */
 		function tabs() {
 
@@ -141,7 +141,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		/**
 		 * Tabs that are active
 		 *
-		 * @return mixed|void
+		 * @return array
 		 */
 		function tabs_active() {
 			$tabs = $this->tabs();
@@ -161,7 +161,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		 *
 		 * @return array
 		 */
-		function tabs_primary(){
+		function tabs_primary() {
 			$tabs = $this->tabs();
 			$primary = array();
 			foreach ( $tabs as $id => $info ) {
@@ -178,7 +178,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		 *
 		 * @return string
 		 */
-		function tabs_enabled(){
+		function tabs_enabled() {
 			$tabs = $this->tabs();
 			foreach( $tabs as $id => $info ){
 				if ( isset( $info['name'] ) ) {
@@ -266,7 +266,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		/**
 		 * Get active_tab
 		 *
-		 * @return mixed|void
+		 * @return string
 		 */
 		function active_tab() {
 
@@ -306,7 +306,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
 		/**
 		 * Get active active_subnav
 		 *
-		 * @return mixed|null
+		 * @return string|null
 		 */
 		function active_subnav() {
 

includes/core/class-uploader.php

@@ -1127,6 +1127,8 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
 					}
 
 					$submitted = get_user_meta( $user_id, 'submitted', true );
+					$submitted = ! empty( $submitted ) ? $submitted : array();
+
 					$submitted[ $key ] = $new_filename;
 					update_user_meta( $user_id, 'submitted', $submitted );
 

includes/core/um-actions-form.php

@@ -431,7 +431,7 @@ function um_submit_form_errors_hook_( $args ) {
 			 */
 			do_action( 'um_add_error_on_form_submit_validation', $array, $key, $args );
 
-			if ( isset( $args[$key] ) ) {
+			if ( isset( $args[ $key ] ) ) {
 
 				if ( isset( $array['required'] ) && $array['required'] == 1 ) {
 					if ( ! isset( $args[$key] ) || $args[$key] == '' || $args[$key] == 'empty_file') {