<?xml version="1.0"?>
<!DOCTYPE modification SYSTEM "http://www.simplemachines.org/xml/modification">

<modification xmlns="http://www.simplemachines.org/xml/modification" xmlns:smf="http://www.simplemachines.org/">
  <id>smf:mysql-5.0.12</id>
  <version>1.1</version>

<file name="$boarddir/SSI.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}messages AS m, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}messages AS m, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ms]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ms)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}polls AS p, {$db_prefix}boards AS b, {$db_prefix}topics AS t" . ($topPollInstead ? ", {$db_prefix}poll_choices AS pc" : '') . "]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}polls AS p, {$db_prefix}boards AS b, {$db_prefix}topics AS t" . ($topPollInstead ? ", {$db_prefix}poll_choices AS pc" : '') . ")]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}polls AS p, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}polls AS p, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS m
			LEFT JOIN {$db_prefix}members AS mem ON (mem.ID_MEMBER = m.ID_MEMBER)]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS m)
			LEFT JOIN {$db_prefix}members AS mem ON (mem.ID_MEMBER = m.ID_MEMBER)]]></add>
	</operation>
</file>
<file name="$sourcedir/BoardIndex.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}categories AS c, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}categories AS c, {$db_prefix}boards AS b)]]></add>
	</operation>
</file>
<file name="$sourcedir/Display.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS ms]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS ms)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
				FROM {$db_prefix}topics AS t, {$db_prefix}messages AS m]]></search>
		<add><![CDATA[
				FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS m)]]></add>
	</operation>
</file>
<file name="$sourcedir/InstantMessage.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}instant_messages AS pm" . ($context['folder'] == 'outbox' ? '' : ", {$db_prefix}im_recipients AS pmr") . "]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}instant_messages AS pm" . ($context['folder'] == 'outbox' ? '' : ", {$db_prefix}im_recipients AS pmr") . ")]]></add>
	</operation>
</file>
<file name="$sourcedir/Load.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}boards AS b" . (!empty($topic) ? ", {$db_prefix}topics AS t" : '') . "]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}boards AS b" . (!empty($topic) ? ", {$db_prefix}topics AS t" : '') . ")]]></add>
	</operation>
</file>
<file name="$sourcedir/ManageAttachments.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}attachments AS a, {$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}messages AS mf]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}attachments AS a, {$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}messages AS mf)]]></add>
	</operation>
</file>
<file name="$sourcedir/ManagePermissions.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}boards AS b, {$db_prefix}categories AS c]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}boards AS b, {$db_prefix}categories AS c)]]></add>
	</operation>
</file>
<file name="$sourcedir/MessageIndex.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS ml, {$db_prefix}messages AS mf]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS ml, {$db_prefix}messages AS mf)]]></add>
	</operation>
</file>
<file name="$sourcedir/MoveTopic.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}log_mark_read AS lmr]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}log_mark_read AS lmr)]]></add>
	</operation>
</file>
<file name="$sourcedir/News.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS m, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS m, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}messages AS m, {$db_prefix}messages AS mf, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}messages AS m, {$db_prefix}messages AS mf, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
</file>
<file name="$sourcedir/Poll.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}polls AS p, {$db_prefix}topics AS t]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}polls AS p, {$db_prefix}topics AS t)]]></add>
	</operation>
</file>
<file name="$sourcedir/Post.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}messages AS m, {$db_prefix}topics AS t
				LEFT JOIN {$db_prefix}attachments AS a ON (a.ID_MSG = m.ID_MSG)]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}messages AS m, {$db_prefix}topics AS t)
				LEFT JOIN {$db_prefix}attachments AS a ON (a.ID_MSG = m.ID_MSG)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
				SELECT m.subject, IFNULL(mem.realName, m.posterName) AS posterName, m.posterTime, m.body
				FROM {$db_prefix}messages AS m, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
				SELECT m.subject, IFNULL(mem.realName, m.posterName) AS posterName, m.posterTime, m.body
				FROM ({$db_prefix}messages AS m, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		SELECT IFNULL(mem.realName, m.posterName) AS posterName, m.posterTime, m.body, m.ID_TOPIC
		FROM {$db_prefix}messages AS m, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		SELECT IFNULL(mem.realName, m.posterName) AS posterName, m.posterTime, m.body, m.ID_TOPIC
		FROM ({$db_prefix}messages AS m, {$db_prefix}boards AS b)]]></add>
	</operation>
</file>
<file name="$sourcedir/Profile.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}log_notify AS ln, {$db_prefix}boards AS b
			LEFT JOIN {$db_prefix}log_boards AS lb ON (lb.ID_BOARD = b.ID_BOARD AND lb.ID_MEMBER = $ID_MEMBER)]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}log_notify AS ln, {$db_prefix}boards AS b)
			LEFT JOIN {$db_prefix}log_boards AS lb ON (lb.ID_BOARD = b.ID_BOARD AND lb.ID_MEMBER = $ID_MEMBER)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}log_notify AS ln, {$db_prefix}boards AS b, {$db_prefix}topics AS t, {$db_prefix}messages AS ms, {$db_prefix}messages AS ml]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}log_notify AS ln, {$db_prefix}boards AS b, {$db_prefix}topics AS t, {$db_prefix}messages AS ms, {$db_prefix}messages AS ml)]]></add>
	</operation>
</file>
<file name="$sourcedir/Recent.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}messages AS m, {$db_prefix}messages AS m2, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}categories AS c]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}messages AS m, {$db_prefix}messages AS m2, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}categories AS c)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			$min_message = (int) $min_message;

		$request = db_query("
			SELECT $select_clause
			FROM {$db_prefix}messages AS ms, {$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
			$min_message = (int) $min_message;

		$request = db_query("
			SELECT $select_clause
			FROM ({$db_prefix}messages AS ms, {$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			SELECT COUNT(DISTINCT t.ID_TOPIC), MIN(t.ID_LAST_MSG)
			FROM {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m]]></search>
		<add><![CDATA[
			SELECT COUNT(DISTINCT t.ID_TOPIC), MIN(t.ID_LAST_MSG)
			FROM ({$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			SELECT DISTINCT t.ID_TOPIC
			FROM {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m]]></search>
		<add><![CDATA[
			SELECT DISTINCT t.ID_TOPIC
			FROM ({$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}messages AS ml, {$db_prefix}messages AS m)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			return;
		}

		$request = db_query("
			SELECT $select_clause
			FROM {$db_prefix}messages AS ms, {$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b]]></search>
		<add><![CDATA[
			return;
		}

		$request = db_query("
			SELECT $select_clause
			FROM ({$db_prefix}messages AS ms, {$db_prefix}messages AS ml, {$db_prefix}topics AS t, {$db_prefix}boards AS b)]]></add>
	</operation>
</file>
<file name="$sourcedir/Search.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
			FROM {$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}categories AS c, {$db_prefix}messages AS first_m, {$db_prefix}messages AS last_m]]></search>
		<add><![CDATA[
			FROM ({$db_prefix}messages AS m, {$db_prefix}topics AS t, {$db_prefix}boards AS b, {$db_prefix}categories AS c, {$db_prefix}messages AS first_m, {$db_prefix}messages AS last_m)]]></add>
	</operation>
</file>
<file name="$sourcedir/SplitTopics.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS m, {$db_prefix}messages AS m2]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS m, {$db_prefix}messages AS m2)]]></add>
	</operation>
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}topics AS t, {$db_prefix}messages AS m1, {$db_prefix}messages AS m2]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}topics AS t, {$db_prefix}messages AS m1, {$db_prefix}messages AS m2)]]></add>
	</operation>
</file>
<file name="$sourcedir/InstantMessage.php">
	<operation error="skip">
		<search position="replace" error="skip"><![CDATA[
		FROM {$db_prefix}instant_messages AS pm" . ($context['folder'] == 'outbox' ? ($context['sort_by'] == 'name' ? "
			LEFT JOIN {$db_prefix}im_recipients AS pmr ON (pmr.ID_PM = pm.ID_PM)" : '') : ", {$db_prefix}im_recipients AS pmr") . ($context['sort_by'] == 'name' ? ("]]></search>
		<add><![CDATA[
		FROM ({$db_prefix}instant_messages AS pm" . ($context['folder'] == 'outbox' ? ')' . ($context['sort_by'] == 'name' ? "
			LEFT JOIN {$db_prefix}im_recipients AS pmr ON (pmr.ID_PM = pm.ID_PM)" : '') : ", {$db_prefix}im_recipients AS pmr)") . ($context['sort_by'] == 'name' ? ("]]></add>
	</operation>
</file>
</modification>