Skip to content

Commit

Permalink
Merge pull request #63 from mjrider/release-prep-9.2
Browse files Browse the repository at this point in the history
Release 9.2
Small bugfix on the 9.1 release to get call_super to work again
  • Loading branch information
mjrider committed Sep 1, 2015
2 parents 0430445 + 26043fd commit f7711ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/objects/ariadne_object.php
Original file line number Diff line number Diff line change
Expand Up @@ -2669,7 +2669,7 @@ public function _call_super($arCallArgs="") {
}
if ($template["arCallTemplate"] && $template["arTemplateId"]) {
$arTemplates=$this->store->get_filestore("templates");
if ($arTemplates->exists($template["arTemplateId"], $template["arCallTemplate"])) {
if ($arTemplates->exists($template["arTemplateId"], $template["arCallTemplate"].".inc")) {
debug("call_super: found template ".$template["arCallTemplate"]." on object with id ".$template["arTemplateId"]);
$arLibrary = $template['arLibrary'];
debug("call_super: found template on ".$template["arTemplateId"]);
Expand Down
7 changes: 4 additions & 3 deletions www/install/upgrade/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,14 @@
array_push($todo, array(
"description" => "Update libraries for muze and vedor",
"operation" => "all/upgrade.muze.libs.php",
"newversion" => "9.1"
"newversion" => "9.2"
));
case '9.1-rc1.2':
case '9.1':
array_push($todo, array(
"description" => "Bumping revision to 9.1",
"description" => "Bumping revision to 9.2",
"operation" => "all/dummy.php",
"newversion" => "9.1"
"newversion" => "9.2"
));

}
Expand Down

0 comments on commit f7711ca

Please sign in to comment.