From 1f0faba71cca7ffc8f20137163677f516119b049 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 30 Jan 2014 11:14:52 +0100
Subject: [PATCH] Stop processing XML on renderer creation

Not needed anymore since 1.6.1 introduced on-demand XML generation.
---
 NEWS.md                       |  2 ++
 lib/cartodb/server_options.js | 20 --------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index cd1f1b09..aaff375a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,8 @@ Bug fixes:
 Enhancements:
 
 * Add support for instanciating a template map with JSONP (#116)
+* Stop processing XML on renderer creation, not needed anymore since 1.6.1
+  introduced on-demand XML generation.
 
 1.6.2 -- 2014-01-23
 -------------------
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index a52896f9..f0123543 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -598,26 +598,6 @@ console.log("Checking authorization from signer " + signer + " for resource " +
         // for cartodb, ensure interactivity is cartodb_id or user specified
         req.params.interactivity = req.params.interactivity || 'cartodb_id';
 
-        req.params.processXML = function(req, xml, callback) {
-
-          // Replace dbuser
-          var dbuser = req.params.dbuser || global.environment.postgres.user;
-          if ( ! me.rx_dbuser ) me.rx_dbuser = /(<Parameter name="user"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/g;
-          xml = xml.replace(me.rx_dbuser, "$1" + dbuser + "$2");
-
-          // Replace dbpass
-          var dbpass = req.params.dbpassword || global.environment.postgres.password;
-          if ( ! me.rx_dbpass ) me.rx_dbpass = /(<Parameter name="password"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/g;
-          xml = xml.replace(me.rx_dbpass, "$1" + dbpass + "$2");
-
-          // Replace or set dbhost
-          var dbhost = req.params.dbhost || global.environment.postgres.host;
-          if ( ! me.rx_dbhost ) me.rx_dbhost = /(<Parameter name="host"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/g;
-          xml = xml.replace(me.rx_dbhost, "$1" + dbhost + "$2");
-
-          callback(null, xml);
-        }
-
         var that = this;
 
         if (req.profiler) req.profiler.done('req2params.setup');