diff --git a/module/execution/control.php b/module/execution/control.php index d30352787b..b814c81170 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2984,6 +2984,9 @@ class execution extends control $executionLang = $this->lang->execution; $executionConfig = $this->config->execution; + $projectID = $from == 'project' ? $this->session->project : 0; + if($projectID) $this->project->setMenu($projectID); + /* Create field lists. */ $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $executionConfig->list->exportFields); foreach($fields as $key => $fieldName) @@ -2993,7 +2996,6 @@ class execution extends control unset($fields[$key]); } - $projectID = $from == 'project' ? $this->session->project : 0; $executionStats = $this->project->getStats($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc'); $users = $this->loadModel('user')->getPairs('noletter'); foreach($executionStats as $i => $execution) diff --git a/module/install/control.php b/module/install/control.php index 8a29c0e407..dc85248f91 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -37,6 +37,7 @@ class install extends control if(!isset($this->config->installed) or !$this->config->installed) $this->session->set('installing', true); $this->view->title = $this->lang->install->welcome; + if(!isset($this->view->versionName)) $this->view->versionName = $this->config->version; // If the versionName variable has been defined in the max version, it cannot be defined here to avoid being overwritten. $this->display(); } diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php index 57f3f1c3eb..5beb7e2ffe 100644 --- a/module/install/view/index.html.php +++ b/module/install/view/index.html.php @@ -31,7 +31,7 @@ - +
install->desc);?>
install->links, $config->version));?>install->links, $versionName));?> app->clientLang != 'en'):?>