diff --git a/modules/file/local_js_library/LocalJsLibraryFileModule.php b/modules/file/local_js_library/LocalJsLibraryFileModule.php index d8f5f9b16..556277857 100644 --- a/modules/file/local_js_library/LocalJsLibraryFileModule.php +++ b/modules/file/local_js_library/LocalJsLibraryFileModule.php @@ -1,14 +1,13 @@ aLibraryName = Manager::usePath(); - $this->aVersion = Manager::usePath(); + $this->sLibraryName = Manager::usePath(); + $this->sVersion = Manager::usePath(); $sExtension = Manager::usePath(); $this->bUseCompression = $sExtension === 'min.js'; } @@ -23,7 +22,7 @@ public function renderFile() { $oIncluder = new ResourceIncluder(); // Don’t use SSL for downloads // Don’t include dependencies either - $oIncluder->addJavaScriptLibrary($this->aLibraryName, $this->aVersion, $this->bUseCompression, false, false, ResourceIncluder::PRIORITY_NORMAL, false); + $oIncluder->addJavaScriptLibrary($this->sLibraryName, $this->sVersion, $this->bUseCompression, false, false, ResourceIncluder::PRIORITY_NORMAL, false); $sContents = self::getResourceIncluderContents($oIncluder); $oCache->setContents($sContents); $oCache->sendCacheControlHeaders(); diff --git a/modules/file/widget_json/WidgetJsonFileModule.php b/modules/file/widget_json/WidgetJsonFileModule.php index 2a8b0a931..a3dad402b 100644 --- a/modules/file/widget_json/WidgetJsonFileModule.php +++ b/modules/file/widget_json/WidgetJsonFileModule.php @@ -2,6 +2,10 @@ class WidgetJsonFileModule extends FileModule { + private $sWidgetType; + + private $sAction; + public static $JSON_ERRORS = array(); public function __construct($aRequestPath) {