eventespresso / event-espresso-core

core/libraries/form_sections/strategies/layout/EE_Two_Column_Layout.strategy.php

Spacing +14 added lines, -14 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base{
+class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base {
 
 	/**
 	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
 	 * @param array $additional_args
 	 * @return string
 	 */
-	public function layout_form_begin( $additional_args = array() ) {
-		return EEH_HTML::table( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()  ) . EEH_HTML::tbody();
+	public function layout_form_begin($additional_args = array()) {
+		return EEH_HTML::table('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()).EEH_HTML::tbody();
 	}
 
 
@@ -18,8 +18,8 @@ 
 	 * @param array $additional_args
 	 * @return string
 	 */
-	public function layout_form_end( $additional_args = array() ) {
-		return EEH_HTML::tbodyx() . EEH_HTML::tablex( $this->_form_section->html_id() );
+	public function layout_form_end($additional_args = array()) {
+		return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
 	}
 
 
@@ -29,17 +29,17 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input ) {
+		if ($input instanceof EE_Hidden_Input) {
 			$html .= $input->get_html_for_input();
 		} else {
 			$html_for_input = $input->get_html_for_input();
-			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
-			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
+			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
 			$html .= EEH_HTML::tr(
-				EEH_HTML::th(  $input->get_html_for_label()  ) .
-				EEH_HTML::td( $html_for_input )
+				EEH_HTML::th($input->get_html_for_label()).
+				EEH_HTML::td($html_for_input)
 			);
 		}
 		return $html;
@@ -52,13 +52,13 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
+	public function layout_subsection($form_section) {
 		$html = '';
-		if ( $form_section instanceof EE_Form_Section_HTML ) {
+		if ($form_section instanceof EE_Form_Section_HTML) {
 			$html .= $form_section->get_html();
 		} else {
 			$html .= EEH_HTML::tr(
-				EEH_HTML::td( $form_section->get_html(), '', '', '', 'colspan="2"' )
+				EEH_HTML::td($form_section->get_html(), '', '', '', 'colspan="2"')
 			);
 		}
 		return $html;

core/libraries/form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php

Spacing +39 added lines, -39 removed lines

@@ -10,14 +10,14 @@ 
  * @since 				4.6.0
  *
  */
-class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base{
+class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base {
 
 	/**
 	 * opening div tag for a form
 	 * @return string
 	 */
 	public function layout_form_begin() {
-		return EEH_HTML::div( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style() );
+		return EEH_HTML::div('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style());
 	}
 
 
@@ -26,38 +26,38 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input  ) {
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
-		} else if ( $input instanceof EE_Submit_Input  ) {
-			$html .= EEH_HTML::div( $input->get_html_for_input(), $input->html_id() . '-submit-dv', $input->html_class() . '-submit-dv' );
-		} else if ( $input instanceof EE_Select_Input  ) {
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
+		} else if ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div($input->get_html_for_input(), $input->html_id().'-submit-dv', $input->html_class().'-submit-dv');
+		} else if ($input instanceof EE_Select_Input) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
-		} else if ( $input instanceof EE_Form_Input_With_Options_Base  ) {
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl() . $this->_display_label_for_option_type_question( $input ) .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		} else {
 			$html .= EEH_HTML::div(
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
-				EEH_HTML::nl() . $input->get_html_for_errors() .
-				EEH_HTML::nl() . $input->get_html_for_input() .
-				EEH_HTML::nl() . $input->get_html_for_help(),
-				$input->html_id() . '-input-dv',
-				$input->html_class() . '-input-dv'
+				EEH_HTML::nl(1).$input->get_html_for_label().
+				EEH_HTML::nl().$input->get_html_for_errors().
+				EEH_HTML::nl().$input->get_html_for_input().
+				EEH_HTML::nl().$input->get_html_for_help(),
+				$input->html_id().'-input-dv',
+				$input->html_class().'-input-dv'
 			);
 		}
 		return $html;
@@ -74,14 +74,14 @@ 
 	 * @param EE_Form_Input_With_Options_Base $input
 	 * @return string
 	 */
-	protected function _display_label_for_option_type_question( EE_Form_Input_With_Options_Base $input ){
-		if ( $input->display_html_label_text() != '' ) {
-			$class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class();
-			$label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text();
-			$html = '<div id="' . $input->html_label_id() . '"';
-			$html .= ' class="' . $class . '"';
-			$html .= ' style="' . $input->html_label_style() . '">';
-			$html .= $label_text . '</div>';
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input) {
+		if ($input->display_html_label_text() != '') {
+			$class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class();
+			$label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text();
+			$html = '<div id="'.$input->html_label_id().'"';
+			$html .= ' class="'.$class.'"';
+			$html .= ' style="'.$input->html_label_style().'">';
+			$html .= $label_text.'</div>';
 			return $html;
 		} else {
 			return '';
@@ -95,9 +95,9 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
+	public function layout_subsection($form_section) {
 //		d( $form_section );
-		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+		return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * closing div tag for a form
 	 * @return string
 	 */
-	public function layout_form_end(){
-		return EEH_HTML::divx( $this->_form_section->html_id(), $this->_form_section->html_class() );
+	public function layout_form_end() {
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
 	}
 }
\ No newline at end of file

core/middleware/EE_Detect_Login.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -26,20 +26,20 @@ 
 	 * @param    EE_Response $response
 	 * @return    EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		global $pagenow;
 		if (
 			in_array(
 				$pagenow,
-				array( 'wp-login.php', 'wp-register.php' )
+				array('wp-login.php', 'wp-register.php')
 			)
-			&& ! $request->get( 'ee_load_on_login' )
+			&& ! $request->get('ee_load_on_login')
 		) {
 			$this->_response->terminate_request();
 		}
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		return $this->_response;
 	}
 

core/EE_Object_Collection.core.php

Doc Comments +1 added lines

@@ -84,6 +84,7 @@
 	 *
 	 * @access public
 	 * @param mixed
+	 * @param string $info
 	 * @return null | object
 	 */
 	public function get_by_info( $info ) {

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Class EE_Object_Collection
@@ -37,14 +37,14 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
+	public function add($object, $info = null) {
 		$class = $this->interface;
-		if ( ! $object instanceof $class ) {
+		if ( ! $object instanceof $class) {
 			return false;
 		}
-		$this->attach( $object );
-		$this->set_info( $object, $info );
-		return $this->contains( $object );
+		$this->attach($object);
+		$this->set_info($object, $info);
+		return $this->contains($object);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param mixed $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = ! empty( $info ) ? $info : spl_object_hash( $object );
+	public function set_info($object, $info = null) {
+		$info = ! empty($info) ? $info : spl_object_hash($object);
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $object == $this->current() ) {
-				$this->setInfo( $info );
+		while ($this->valid()) {
+			if ($object == $this->current()) {
+				$this->setInfo($info);
 				$this->rewind();
 				return true;
 			}
@@ -86,10 +86,10 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
+	public function get_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				$object = $this->current();
 				$this->rewind();
 				return $object;
@@ -110,8 +110,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return $this->contains( $object );
+	public function has($object) {
+		return $this->contains($object);
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		$this->detach( $object );
+	public function remove($object) {
+		$this->detach($object);
 		return true;
 	}
 
@@ -141,10 +141,10 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
+	public function set_current($object) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current() === $object ) {
+		while ($this->valid()) {
+			if ($this->current() === $object) {
 				break;
 			}
 			$this->next();
@@ -162,10 +162,10 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
+	public function set_current_by_info($info) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $info === $this->getInfo() ) {
+		while ($this->valid()) {
+			if ($info === $this->getInfo()) {
 				break;
 			}
 			$this->next();

core/Psr4Autoloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 	 * Loads the class file for a given class name.
 	 *
 	 * @param string $class The fully-qualified class name.
-	 * @return mixed The mapped file name on success, or boolean false on
+	 * @return string|false The mapped file name on success, or boolean false on
 	 * failure.
 	 */
 	public function loadClass( $class ) {
@@ -165,7 +165,7 @@ 
 	 *
 	 * @param string $prefix The namespace prefix.
 	 * @param string $relative_class The relative class name.
-	 * @return mixed Boolean false if no mapped file can be loaded, or the
+	 * @return string|false Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
 	protected function loadMappedFile( $prefix, $relative_class ) {

Spacing +25 added lines, -25 removed lines

@@ -77,10 +77,10 @@ 
 	 * @param string $prefix
 	 * @return array
 	 */
-	public function prefixes( $prefix = '' ) {
-		if ( ! empty( $prefix ) ) {
+	public function prefixes($prefix = '') {
+		if ( ! empty($prefix)) {
 			// are there any base directories for this namespace prefix?
-			return isset( $this->prefixes[ $prefix ] ) ? $this->prefixes[ $prefix ] : array();
+			return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : array();
 		}
 		return $this->prefixes;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return void
 	 */
 	public function register() {
-		spl_autoload_register( array( $this, 'loadClass' ) );
+		spl_autoload_register(array($this, 'loadClass'));
 	}
 
 
@@ -109,20 +109,20 @@ 
 	 * than last.
 	 * @return void
 	 */
-	public function addNamespace( $prefix, $base_dir, $prepend = false ) {
+	public function addNamespace($prefix, $base_dir, $prepend = false) {
 		// normalize namespace prefix
-		$prefix = trim( $prefix, Psr4Autoloader::NS ) . Psr4Autoloader::NS;
+		$prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
 		// normalize the base directory with a trailing separator
-		$base_dir = \EEH_File::standardise_and_end_with_directory_separator( $base_dir );
+		$base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir);
 		// initialize the namespace prefix array
-		if ( isset( $this->prefixes[ $prefix ] ) === false ) {
-			$this->prefixes[ $prefix ] = array();
+		if (isset($this->prefixes[$prefix]) === false) {
+			$this->prefixes[$prefix] = array();
 		}
 		// retain the base directory for the namespace prefix
-		if ( $prepend ) {
-			array_unshift( $this->prefixes[ $prefix ], $base_dir );
+		if ($prepend) {
+			array_unshift($this->prefixes[$prefix], $base_dir);
 		} else {
-			$this->prefixes[ $prefix ][] = $base_dir;
+			$this->prefixes[$prefix][] = $base_dir;
 		}
 	}
 
@@ -135,24 +135,24 @@ 
 	 * @return mixed The mapped file name on success, or boolean false on
 	 * failure.
 	 */
-	public function loadClass( $class ) {
+	public function loadClass($class) {
 		// the current namespace prefix
 		$prefix = $class;
 		// work backwards through the namespace names of the fully-qualified
 		// class name to find a mapped file name
-		while ( false !== $pos = strrpos( $prefix, Psr4Autoloader::NS ) ) {
+		while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
 			// retain the trailing namespace separator in the prefix
-			$prefix = substr( $class, 0, $pos + 1 );
+			$prefix = substr($class, 0, $pos + 1);
 			// the rest is the relative class name
-			$relative_class = substr( $class, $pos + 1 );
+			$relative_class = substr($class, $pos + 1);
 			// try to load a mapped file for the prefix and relative class
-			$mapped_file = $this->loadMappedFile( $prefix, $relative_class );
-			if ( $mapped_file ) {
+			$mapped_file = $this->loadMappedFile($prefix, $relative_class);
+			if ($mapped_file) {
 				return $mapped_file;
 			}
 			// remove the trailing namespace separator for the next iteration
 			// of strrpos()
-			$prefix = rtrim( $prefix, Psr4Autoloader::NS );
+			$prefix = rtrim($prefix, Psr4Autoloader::NS);
 		}
 		// never found a mapped file
 		return false;
@@ -168,17 +168,17 @@ 
 	 * @return mixed Boolean false if no mapped file can be loaded, or the
 	 * name of the mapped file that was loaded.
 	 */
-	protected function loadMappedFile( $prefix, $relative_class ) {
+	protected function loadMappedFile($prefix, $relative_class) {
 		// look through base directories for this namespace prefix
-		foreach ( $this->prefixes( $prefix ) as $base_dir ) {
+		foreach ($this->prefixes($prefix) as $base_dir) {
 			// replace the namespace prefix with the base directory,
 			// replace namespace separators with directory separators
 			// in the relative class name, append with .php
 			$file = $base_dir
-				. str_replace( Psr4Autoloader::NS, DS, $relative_class )
+				. str_replace(Psr4Autoloader::NS, DS, $relative_class)
 				. '.php';
 			// if the mapped file exists, require it
-			if ( $this->requireFile( $file ) ) {
+			if ($this->requireFile($file)) {
 				// yes, we're done
 				return $file;
 			}
@@ -195,8 +195,8 @@ 
 	 * @param string $file The file to require.
 	 * @return bool True if the file exists, false if not.
 	 */
-	protected function requireFile( $file ) {
-		if ( file_exists( $file ) ) {
+	protected function requireFile($file) {
+		if (file_exists($file)) {
 			require $file;
 			return true;
 		}

core/services/locators/LocatorInterface.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\locators;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,7 +22,7 @@ 
 	 * @param array|string $location
 	 * @return \FilesystemIterator
 	 */
-	public function locate( $location );
+	public function locate($location);
 
 }
 // End of file LocatorInterface.php

core/libraries/form_sections/strategies/EE_Form_Input_Strategy_Base.strategy.php

Spacing +3 added lines, -3 removed lines

@@ -3,14 +3,14 @@ 
  * base class for all strategies which operate on form inputs. Generally, they
  * all need to know about the form input they are operating on.
  */
-abstract class EE_Form_Input_Strategy_Base{
+abstract class EE_Form_Input_Strategy_Base {
 	/**
 	 * Form Input to display
 	 * @var EE_Form_Input_Base
 	 */
 	protected $_input;
 	
-	function __construct(){
+	function __construct() {
 		
 	}
 
@@ -18,7 +18,7 @@ 
 	 * The form input on which this strategy is to perform
 	 * @param EE_Form_Input_Base $form_input
 	 */
-	function _construct_finalize(EE_Form_Input_Base $form_input){
+	function _construct_finalize(EE_Form_Input_Base $form_input) {
 		$this->_input = $form_input;
 	}
 	

core/libraries/form_sections/strategies/display/EE_Compound_Input_Display_Strategy.strategy.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -27,8 +27,8 @@ 
 	 * @param bool   $add_pound_sign
 	 * @return string
 	 */
-	public function get_sub_input_id( $option_value, $add_pound_sign = false ) {
-		return $this->_append_chars( $this->_input->html_id( $add_pound_sign ), '-' ) . sanitize_key( $option_value );
+	public function get_sub_input_id($option_value, $add_pound_sign = false) {
+		return $this->_append_chars($this->_input->html_id($add_pound_sign), '-').sanitize_key($option_value);
 	}
 
 
@@ -40,10 +40,10 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_html_input_ids( $add_pound_sign = false ) {
+	public function get_html_input_ids($add_pound_sign = false) {
 		$html_input_ids = array();
-		foreach( $this->get_input()->options() as $value => $display ) {
-			$html_input_ids[] = $this->get_sub_input_id( $value, $add_pound_sign );
+		foreach ($this->get_input()->options() as $value => $display) {
+			$html_input_ids[] = $this->get_sub_input_id($value, $add_pound_sign);
 		}
 		return $html_input_ids;
 	}
@@ -58,7 +58,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function get_input() {
-		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base ){
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
 			throw new EE_Error(
 				sprintf(
 					__(

core/libraries/messages/EE_Message_To_Generate_From_Queue.php

Spacing +9 added lines, -9 removed lines

@@ -25,12 +25,12 @@ 
 	 * @param EE_Messages_Queue $queue
 	 * @param string            $custom_subject  Used if a custom subject is desired for the generated aggregate EE_Message object
 	 */
-	public function __construct( $messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public function __construct($messenger_name, $message_type_name, EE_Messages_Queue $queue, $custom_subject = '') {
 		$this->queue = $queue;
-		parent::__construct( $messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle );
-		if ( $this->valid() ) {
-			$this->_message->set_content( $this->_get_content() );
-			$this->_message->set_subject( $this->_get_subject( $custom_subject ) );
+		parent::__construct($messenger_name, $message_type_name, array(), '', false, EEM_Message::status_idle);
+		if ($this->valid()) {
+			$this->_message->set_content($this->_get_content());
+			$this->_message->set_subject($this->_get_subject($custom_subject));
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 	protected function _get_content() {
 		$content = '';
 		$this->queue->get_message_repository()->rewind();
-		while ( $this->queue->get_message_repository()->valid() ) {
+		while ($this->queue->get_message_repository()->valid()) {
 			$content .= $this->queue->get_message_repository()->current()->content();
 			$this->queue->get_message_repository()->next();
 		}
@@ -58,15 +58,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_subject( $custom_subject = '' ) {
-		if ( ! empty( $custom_subject ) ) {
+	protected function _get_subject($custom_subject = '') {
+		if ( ! empty($custom_subject)) {
 			return $custom_subject;
 		}
 		$this->queue->get_message_repository()->rewind();
 		$count_of_items = $this->queue->get_message_repository()->count();
 
 		//if $count of items in queue == 1, then let's just return the subject for that item.
-		if ( $count_of_items === 1 ) {
+		if ($count_of_items === 1) {
 			return $this->queue->get_message_repository()->current()->subject();
 		}