Merge branch 'sprint/165_zenggang' into 'sprint/165'

* Fix bug#15368

See merge request easycorp/zentaopms!35

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)

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();
     }
 

module/install/view/index.html.php

@@ -31,7 +31,7 @@
       <table>
         <tr><td colspan='2'><?php echo nl2br($lang->install->desc);?></td></tr>
         <tr>
-          <td class=''><?php echo nl2br(sprintf($lang->install->links, $config->version));?></td>
+          <td class=''><?php echo nl2br(sprintf($lang->install->links, $versionName));?></td>
           <td class='w-p25'>
             <?php if($this->app->clientLang != 'en'):?>
             <img src="<?php echo $this->app->getWebRoot() . 'theme/default/images/main/weixin.jpg'?>" width='200' height='200'>