gistfile1.diff

diff --git a/src/client.cpp b/src/client.cpp
index ee63cf7..f0b555b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1623,6 +1623,8 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        // not supported by server or turned off
                }
 
+               m_media_downloader->addRemoteServer("http://cdn.freeminer.org/");
+
                m_media_downloader->step(this);
                if (m_media_downloader->isDone()) {
                        // might be done already if all media is in the cache
diff --git a/src/nodemetadata.h b/src/nodemetadata.h
index ce2c9e6..7102705 100644
--- a/src/nodemetadata.h
+++ b/src/nodemetadata.h
@@ -55,7 +55,7 @@ class NodeMetadata
                i = m_stringvars.find(name);
                if(i == m_stringvars.end())
                        return "";
-               return resolveString(i->second);
+               return i->second;
        }
        void setString(const std::string &name, const std::string &var)
        {
@@ -68,7 +68,7 @@ class NodeMetadata
        std::string resolveString(const std::string &str) const
        {
                if(str.substr(0,2) == "${" && str[str.length()-1] == '}')
-                       return resolveString(getString(str.substr(2,str.length()-3)));
+                       return getString(str.substr(2,str.length()-3));
                return str;
        }
        std::map<std::string, std::string> getStrings() const