diff --git a/core/src/plugins/action.share/class.ShareCenter.js b/core/src/plugins/action.share/class.ShareCenter.js index ca23f37574..3e68adbebd 100644 --- a/core/src/plugins/action.share/class.ShareCenter.js +++ b/core/src/plugins/action.share/class.ShareCenter.js @@ -444,10 +444,10 @@ Class.create("ShareCenter", { if(json['download_limit']){ oForm.down('input[name="downloadlimit"]').setValue(json['download_limit']); } + var chooser = this.createTemplateChooser(oForm); + var container = oForm.down('.layout_template_container'); + container.insert(chooser); if(json["minisite_layout"]){ - var chooser = this.createTemplateChooser(oForm); - var container = oForm.down('.layout_template_container'); - container.insert(chooser); chooser.setValue(json['minisite_layout']); } if(json['is_expired']){ @@ -1223,7 +1223,7 @@ Class.create("ShareCenter", { var aSpan = new Element('span', { className:'', title:MessageHash['share_center.152'] - }).update(' '+MessageHash['share_center.152']); + }).update(' '+MessageHash['share_center.152']); var editButton = new Element('div', {className:'largeButton'}).update(aSpan); bottomButtonsContainer.insert(editButton); bottomButtonsContainer.show(); diff --git a/core/src/plugins/meta.quota/class.QuotaComputer.php b/core/src/plugins/meta.quota/class.QuotaComputer.php index 1f8957d466..b113ba5fc9 100644 --- a/core/src/plugins/meta.quota/class.QuotaComputer.php +++ b/core/src/plugins/meta.quota/class.QuotaComputer.php @@ -164,14 +164,14 @@ public function loadRepositoryInfo(&$data){ public function recomputeQuotaUsage($oldNode = null, $newNode = null, $copy = false) { - $path = $this->getWorkingPath(); - $q = $this->computeDirSpace($path); - $this->storeUsage($path, $q); + $repoOptions = $this->getWorkingRepositoryOptions(); + $q = $this->accessDriver->directoryUsage("", $repoOptions); + $this->storeUsage($q); $t = $this->getAuthorized(); AJXP_Controller::applyHook("msg.instant", array("", $this->accessDriver->repository->getId())); } - protected function storeUsage($dir, $quota) + protected function storeUsage($quota) { $data = $this->getUserData(); $repo = $this->accessDriver->repository->getId();