Rendering: Fix panel PNG rendering when using sub url & serve_from_su…

…b_path = true (#21306)

* Rendering: fix dashboard rendering when using sub url

* rollback on render.go: no need to add sub-path

(cherry picked from commit b8b6182)

pkg/api/index.go

@@ -43,7 +43,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 	appSubURL := setting.AppSubUrl
 
 	// special case when doing localhost call from phantomjs
-	if c.IsRenderCall {
+	if c.IsRenderCall && !hs.Cfg.ServeFromSubPath {
 		appURL = fmt.Sprintf("%s://localhost:%s", setting.Protocol, setting.HttpPort)
 		appSubURL = ""
 		settings["appSubUrl"] = ""