Rewrote a lot parts to extract 'payments' table (+ handling) into own extension:

[mailer.git] / inc / modules / admin / what-unlock_emails.php

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index f23946d3ba9bbe86d83f29359d03378b159251f0..980ee0cae4ac08f87aeae9661145c31441f1c75f 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -70,19 +70,14 @@ if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
 
                                // Order placed in queue...
                                $result = SQL_QUERY_ESC('SELECT
-       po.`url`,
-       po.`subject`,
-       po.`sender`,
-       pay.`payment`,
-       po.`payment_id`
+       `url`,
+       `subject`,
+       `sender`,
+       `payment_id`
 FROM
-       `{?_MYSQL_PREFIX?}_pool` AS `po`
-INNER JOIN
-       `{?_MYSQL_PREFIX?}_payments` AS `pay`
-ON
-       po.`payment_id`=pay.`id`
+       `{?_MYSQL_PREFIX?}_pool`
 WHERE
-       po.`id`=%s
+       `id`=%s
 LIMIT 1',
                                        array($id), __FILE__, __LINE__);
 
@@ -91,6 +86,9 @@ LIMIT 1',
                                        // Load data
                                        $content = SQL_FETCHARRAY($result);
 
+                                       // Get payment from getter to avoid JOIN
+                                       $content['payment'] = getPaymentData($content['payment_id', 'payment');
+
                                        // Is the surfbar installed?
                                        // @TODO Rewrite these if-blocks to a filter
                                        if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {