From d06a4c27b9aa23152dbca62e42a7db1eec04ea63 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 18 Apr 2022 15:23:05 -0700 Subject: [PATCH] Modified Update routine to say v2.3.3. --- e107_admin/update_routines.php | 6 +++--- install.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 678b770dd..fcc75883e 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -114,7 +114,7 @@ if (!$dont_check_update) // $dbupdate['217_to_218'] = array('master'=>false, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.1.7','2.1.8')), 'message'=> null, 'hide_when_complete'=>true); $dbupdate['706_to_800'] = array('master'=>true, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('1.x','2.0')), 'message'=> LAN_UPDATE_29, 'hide_when_complete'=>true); - $dbupdate['20x_to_231'] = array('master'=>true, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.x','2.3.1')), 'message'=> null, 'hide_when_complete'=>false); + $dbupdate['20x_to_233'] = array('master'=>true, 'title'=> e107::getParser()->lanVars($LAN_UPDATE_4, array('2.x','2.3.3')), 'message'=> null, 'hide_when_complete'=>false); @@ -628,7 +628,7 @@ function update_core_database($type = '') * @param string $type * @return bool true = no update required, and false if update required. */ - function update_20x_to_231($type='') + function update_20x_to_233($type='') { $sql = e107::getDb(); @@ -2138,7 +2138,7 @@ function theme_foot() if(!empty($_POST['update_core']['706_to_800'])) { - $data = array('name'=>SITENAME, 'theme'=>$pref['sitetheme'], 'language'=>e_LANGUAGE, 'url'=>SITEURL, 'type'=>'upgrade'); + $data = array('name'=>SITENAME, 'theme'=>$pref['sitetheme'], 'language'=>e_LANGUAGE, 'url'=>SITEURL, 'type'=>'upgrade', 'version'=> defset('e_VERSION')); $base = base64_encode(http_build_query($data, null, '&')); $url = "https://e107.org/e-install/".$base; return ""; diff --git a/install.php b/install.php index c9853e924..2e74f456c 100644 --- a/install.php +++ b/install.php @@ -1656,7 +1656,7 @@ if($this->pdo == true) { global $e_forms; - $data = array('name'=>$this->previous_steps['prefs']['sitename'], 'theme'=>$this->previous_steps['prefs']['sitetheme'], 'language'=>$this->previous_steps['language'], 'url'=>$_SERVER['HTTP_REFERER']); + $data = array('name'=>$this->previous_steps['prefs']['sitename'], 'theme'=>$this->previous_steps['prefs']['sitetheme'], 'language'=>$this->previous_steps['language'], 'url'=>$_SERVER['HTTP_REFERER'],'version'=> defset('e_VERSION')); $base = base64_encode(http_build_query($data, '')); $url = "https://e107.org/e-install/".$base; $e_forms->add_plain_html("");