Version 4.7.13

system/Poll/Poll.php

@@ -125,9 +125,9 @@ class _Poll extends \IPS\Patterns\ActiveRecord implements \SplSubject
 	/**
 	 * Get Poll Close Date
 	 *
-	 * @return	\IPS\DateTime
+	 * @return	\IPS\DateTime|int
 	 */
-	public function get_poll_close_date()
+	public function get_poll_close_date() : \IPS\DateTime|int
 	{
 		if( $this->_pollCloseDateObject instanceof \IPS\DateTime )
 		{
@@ -680,7 +680,7 @@ class _Poll extends \IPS\Patterns\ActiveRecord implements \SplSubject
 			'title'		=> $this->poll_question,
 			'startDate'	=> $this->start_date->rfc3339(),
 			'closed'	=> (bool) $this->poll_closed,
-			'closedDate'	=> ( $this->poll_closed ? $this->poll_close_date->rfc3339() : null ),
+			'closedDate'	=> ( ( $this->poll_closed AND $this->poll_close_date instanceof \IPS\DateTime ) ? $this->poll_close_date->rfc3339() : null ),
 			'public'	=> (bool) $this->poll_view_voters,
 			'votes'		=> $this->votes,
 			'questions'	=> $questions