Author: solomax
Date: Tue Jul 28 12:56:58 2015
New Revision: 1693087
URL: http://svn.apache.org/r1693087
Log:
[OPENMEETINGS-1238] correct URL is being used as application base URL
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx?rev=1693087&r1=1693086&r2=1693087&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx Tue Jul 28
12:56:58 2015
@@ -154,7 +154,7 @@
<method name="getAppBaseUrl">
<![CDATA[
- return canvas.getServerBaseUrl() + "swf"
+ return getUrl() + "swf";
]]>
</method>
@@ -164,7 +164,7 @@
? hib.currentdomainObj.organisation_id : 1;
if ($debug) Debug.write("mainMethods::getScreenSharingUrl ",
hib.userobject, hib.currentdomainObj);
- var appBase = canvas.getServerBaseUrl();
+ var appBase = canvas.getUrl();
if ($debug) Debug.write("appBase=" + appBase);
var downloadurl = appBase + 'screen.upload?'
+'rtmphostlocal=' + canvas.getHttpHost()
