3 files changed, 62 insertions, 15 deletions
diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php
index 7d1e12c52d..f65745f6ab 100644
--- a/phpBB/phpbb/textreparser/base.php
+++ b/phpBB/phpbb/textreparser/base.php
@@ -63,8 +63,8 @@ abstract class base implements reparser_interface
 			$bitfield,
 			$flags,
 			$unparsed['enable_bbcode'],
-			$unparsed['enable_smilies'],
-			$unparsed['enable_magic_url']
+			$unparsed['enable_magic_url'],
+			$unparsed['enable_smilies']
 		);
 
 		// Save the new text if it has changed
diff --git a/phpBB/phpbb/textreparser/plugins/user_signature.php b/phpBB/phpbb/textreparser/plugins/user_signature.php
index 2beaaf98e5..7a66f39ab6 100644
--- a/phpBB/phpbb/textreparser/plugins/user_signature.php
+++ b/phpBB/phpbb/textreparser/plugins/user_signature.php
@@ -16,14 +16,47 @@ namespace phpbb\textreparser\plugins;
 class user_signature extends \phpbb\textreparser\row_based_plugin
 {
 	/**
+	* @var array Bit numbers used for user options
+	* @see \phpbb\user
+	*/
+	protected $keyoptions;
+
+	/**
+	* Constructor
+	*
+	* Retrieves and saves the bit numbers used for user options
+	*/
+	public function __construct()
+	{
+		$class_vars = get_class_vars('phpbb\\user');
+		$this->keyoptions = $class_vars['keyoptions'];
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	protected function add_missing_fields(array $row)
+	{
+		$options = $row['user_options'];
+		$row += array(
+			'enable_bbcode'    => phpbb_optionget($this->keyoptions['sig_bbcode'], $options),
+			'enable_smilies'   => phpbb_optionget($this->keyoptions['sig_smilies'], $options),
+			'enable_magic_url' => phpbb_optionget($this->keyoptions['sig_links'], $options),
+		);
+
+		return $row;
+	}
+
+	/**
 	* {@inheritdoc}
 	*/
 	protected function get_columns()
 	{
 		return array(
-			'id'         => 'user_id',
-			'text'       => 'user_sig',
-			'bbcode_uid' => 'user_sig_bbcode_uid',
+			'id'           => 'user_id',
+			'text'         => 'user_sig',
+			'bbcode_uid'   => 'user_sig_bbcode_uid',
+			'user_options' => 'user_options',
 		);
 	}
 
diff --git a/phpBB/phpbb/textreparser/row_based_plugin.php b/phpBB/phpbb/textreparser/row_based_plugin.php
index 2317c79e4f..b946d6532b 100644
--- a/phpBB/phpbb/textreparser/row_based_plugin.php
+++ b/phpBB/phpbb/textreparser/row_based_plugin.php
@@ -45,6 +45,29 @@ abstract class row_based_plugin extends base
 	abstract protected function get_table_name();
 
 	/**
+	* Add fields to given row, if applicable
+	*
+	* The enable_* fields are not always saved to the database. Sometimes we need to guess their
+	* original value based on the text content or possibly other fields
+	*
+	* @param  array $row Original row
+	* @return array      Complete row
+	*/
+	protected function add_missing_fields(array $row)
+	{
+		if (!isset($row['enable_bbcode'], $row['enable_smilies'], $row['enable_magic_url']))
+		{
+			$row += array(
+				'enable_bbcode'    => !empty($row['bbcode_uid']),
+				'enable_smilies'   => (strpos($row['text'], '<!-- s') !== false),
+				'enable_magic_url' => (strpos($row['text'], '<!-- m -->') !== false),
+			);
+		}
+
+		return $row;
+	}
+
+	/**
 	* {@inheritdoc}
 	*/
 	public function get_max_id()
@@ -67,16 +90,7 @@ abstract class row_based_plugin extends base
 		$result = $this->db->sql_query($this->get_records_query($min_id, $max_id));
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (!isset($row['enable_bbcode'], $row['enable_smilies'], $row['enable_magic_url']))
-			{
-				// Those fields are not saved to the database, we need to guess their original value
-				$row += array(
-					'enable_bbcode'    => !empty($row['bbcode_uid']),
-					'enable_smilies'   => (strpos($row['text'], '<!-- s') !== false),
-					'enable_magic_url' => (strpos($row['text'], '<!-- m -->') !== false)
-				);
-			}
-			$records[] = $row;
+			$records[] = $this->add_missing_fields($row);
 		}
 		$this->db->sql_freeresult($result);