Merge branch 'development/2.6.1' into feature/um-blocks

includes/core/class-shortcodes.php

@@ -1,30 +1,62 @@
 <?php
 namespace um\core;
 
-// Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 
-
 	/**
 	 * Class Shortcodes
 	 * @package um\core
 	 */
 	class Shortcodes {
 
-		var $profile_role = '';
+		/**
+		 * @var string
+		 */
+		public $profile_role = '';
+
+		/**
+		 * @var bool
+		 */
+		public $message_mode = false;
+
+		/**
+		 * @var string
+		 */
+		public $custom_message = '';
+
+		/**
+		 * @var array
+		 */
+		public $loop = array();
+
+		/**
+		 * @var array
+		 */
+		public $emoji = array();
+
+		/**
+		 * @var null|int
+		 */
+		public $form_id = null;
+
+		/**
+		 * @var null|string
+		 */
+		public $form_status = null;
+
+		/**
+		 * @var array
+		 */
+		public $set_args = array();
 
 		/**
 		 * Shortcodes constructor.
 		 */
-		function __construct() {
-
-			$this->message_mode = false;
-			$this->custom_message = '';
-
-			$this->loop = array();
-
+		public function __construct() {
 			add_shortcode( 'ultimatemember', array( &$this, 'ultimatemember' ) );
 
 			add_shortcode( 'ultimatemember_login', array( &$this, 'ultimatemember_login' ) );
@@ -123,10 +155,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			$this->emoji[':innocent:'] = $base_uri . '72x72/1f607.png';
 			$this->emoji[':smirk:'] = $base_uri . '72x72/1f60f.png';
 			$this->emoji[':expressionless:'] = $base_uri . '72x72/1f611.png';
-
 		}
 
-
 		/**
 		 * Conditional logout form
 		 *