From 7586c35752d48803eb6f2df1609331a3ca799e9f Mon Sep 17 00:00:00 2001
From: quix0r <quix0r@mxchange.org>
Date: Sun, 13 Jun 2010 09:09:53 +0000
Subject: [PATCH] Fix for broken SQL while installation phase and runtime

---
 inc/db/lib-mysql3.php                 | 4 ++--
 inc/functions.php                     | 2 +-
 inc/modules/admin/admin-inc.php       | 2 +-
 inc/modules/admin/what-list_beg.php   | 2 +-
 inc/modules/admin/what-list_bonus.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index b802cb34b3..73bdd9004d 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -545,8 +545,8 @@ function SQL_HASZERONUMS ($result) {
 function SQL_PREPARE_SQL_STRING ($sqlString) {
 	// Is it already cached?
 	if (!isset($GLOBALS['sql_strings'][$sqlString])) {
-		// No, then generate the eval() command
-		$eval = '$sql = "' . FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))) . '";';
+		// No, generate the eval() command
+		$eval = '$sql = "' . FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString)) . '";';
 		eval($eval);
 
 		// ... and set it
diff --git a/inc/functions.php b/inc/functions.php
index f85b4df13e..a8935e8c2c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2640,7 +2640,7 @@ function getMessageFromErrorCode ($code) {
 			if (isExtensionActive('mailid', true)) {
 				$message = getMessage('ERROR_CONFIRMING_MAIL');
 			} else {
-				$message = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'mailid');
+				$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
 			}
 			break;
 
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index e63b021236..9ac1fadacc 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1268,7 +1268,7 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'admins');
+				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
 			}
 		} else {
 			// Maybe deleted?
diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 967b68ee81..ebe814aa93 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -120,7 +120,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 		if (isExtensionActive('autopurge')) {
 			$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
 		} else {
-			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge'));
+			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge'));
 		}
 
 		// Load final template
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 6a273ad932..38c8ee8f84 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -132,7 +132,7 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
 		if (isExtensionActive('autopurge')) {
 			$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
 		} else {
-			$content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge');
+			$content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge');
 		}
 
 		// Load final template
-- 
2.39.5