removed reference to MS_VARS_FORMATSTRING_EX

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@76 c086bb3d-8645-0410-b8da-73a8550f86e7

1 files changed, 1 insertions, 17 deletions

diff --git a/Plugins/utils/mir_buffer.h b/Plugins/utils/mir_buffer.h
index f72da9e..e4e7385 100644
--- a/Plugins/utils/mir_buffer.h
+++ b/Plugins/utils/mir_buffer.h
@@ -414,28 +414,12 @@ static void ReplaceVars(Buffer<TCHAR> *buffer, HANDLE hContact, TCHAR **variable
 

 static void ReplaceTemplate(Buffer<TCHAR> *out, HANDLE hContact, TCHAR *templ, TCHAR **vars, int numVars)

 {

-	if (ServiceExists(MS_VARS_FORMATSTRING_EX)) 

-	{

-		TCHAR *tmp = variables_parse_ex(templ, NULL, hContact, vars, numVars);

-		if (tmp != NULL)

-		{

-			out->append(tmp);

-			variables_free(tmp);

-			out->pack();

-			return;

-		}

-	}

 

 	if (ServiceExists(MS_VARS_FORMATSTRING)) 

 	{

-		out->append(templ);

-		ReplaceVars(out, hContact, vars, numVars);

-		out->pack();

-

-		TCHAR *tmp = variables_parse(out->str, NULL, hContact);

+		TCHAR *tmp = variables_parse_ex(templ, NULL, hContact, vars, numVars);

 		if (tmp != NULL)

 		{

-			out->clear();

 			out->append(tmp);

 			variables_free(tmp);

 			out->pack();