Clean up

Fix things

Author: iMattPro

controller/base.php

@@ -92,7 +92,7 @@ public function __construct(auth $auth, config $config, helper $helper, language
 	/**
 	 * Set the Ideas entity
 	 *
-	 * @param string $entity
+	 * @param \phpbb\ideas\factory\ideas|\phpbb\ideas\factory\idea $entity
 	 */
 	public function get_entity($entity)
 	{

controller/post_controller.php

@@ -10,7 +10,7 @@
 
 namespace phpbb\ideas\controller;
 
-use \phpbb\exception\http_exception;
+use phpbb\exception\http_exception;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class post_controller extends base

factory/base.php

@@ -13,6 +13,7 @@
 use phpbb\auth\auth;
 use phpbb\config\config;
 use phpbb\db\driver\driver_interface;
+use phpbb\ideas\ext;
 use phpbb\language\language;
 use phpbb\user;
 
@@ -76,6 +77,18 @@ public function __construct(auth $auth, config $config, driver_interface $db, la
 		$this->table_topics = $table_topics;
 	}
 
+	/**
+	 * Returns the status name from the status ID specified.
+	 *
+	 * @param int $id ID of the status.
+	 *
+	 * @return string|bool The status name if it exists, false otherwise.
+	 */
+	public function get_status_from_id($id)
+	{
+		return $this->language->lang(array_search($id, ext::$statuses));
+	}
+
 	/**
 	 * Helper method for inserting new idea data
 	 *

factory/idea.php

@@ -17,9 +17,6 @@
  */
 class idea extends base
 {
-	/** @var string */
-	protected $profile_url;
-
 	/**
 	 * Returns the specified idea.
 	 *
@@ -58,18 +55,6 @@ public function get_idea_by_topic_id($id)
 		return $this->get_idea($idea_id);
 	}
 
-	/**
-	 * Returns the status name from the status ID specified.
-	 *
-	 * @param int $id ID of the status.
-	 *
-	 * @return string|bool The status name if it exists, false otherwise.
-	 */
-	public function get_status_from_id($id)
-	{
-		return $this->language->lang(array_search($id, ext::$statuses));
-	}
-
 	/**
 	 * Updates the status of an idea.
 	 *
@@ -437,28 +422,12 @@ public function get_voters($id)
 
 		// Process the username for the template now, so it is
 		// ready to use in AJAX responses and DOM injections.
+		$profile_url = append_sid(generate_board_url() . "/memberlist.{$this->php_ext}", array('mode' => 'viewprofile'));
 		foreach ($rows as &$row)
 		{
-			$row['user'] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $this->profile_url());
+			$row['user'] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url);
 		}
 
 		return $rows;
 	}
-
-	/**
-	 * Helper to generate the user profile URL with an
-	 * absolute URL, which helps avoid problems when
-	 * used in AJAX requests.
-	 *
-	 * @return string User profile URL
-	 */
-	protected function profile_url()
-	{
-		if (!isset($this->profile_url))
-		{
-			$this->profile_url = append_sid(generate_board_url() . "/memberlist.{$this->php_ext}", array('mode' => 'viewprofile'));
-		}
-
-		return $this->profile_url;
-	}
 }