From 4433421c48e8f6f7bf5df7593bf150eb38d9b184 Mon Sep 17 00:00:00 2001
From: Philip Munaawa <philip.munaawa@appliansys.com>
Date: Tue, 24 Apr 2018 13:06:46 +0100
Subject: [PATCH] also replace __CONTENT_ESCAPED__ for --nosearchbar

---
 src/server/kiwix-serve.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index b37f217..9d05f53 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -161,9 +161,9 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
              humanReadableBookId,
              "__CONTENT__"));
     }
-    content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
   }
   content = replaceRegex(content, rootLocation, "__ROOT_LOCATION__");
+  content = replaceRegex(content, replaceRegex(humanReadableBookId, "%26", "&"), "__CONTENT_ESCAPED__");
   pthread_mutex_unlock(&regexLock);
 }