aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-18 00:46:54 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-18 00:46:54 +0000
commit5a06233304a9965c8319ec5c1fcc4fd582393d02 (patch)
treec70268e7920779f890ad3858c39b1ed2b0fa1623 /install
parent5ee52a817885e641a56eef6ebcdd4250ef8be4b5 (diff)
downloadelgg-5a06233304a9965c8319ec5c1fcc4fd582393d02.tar.gz
elgg-5a06233304a9965c8319ec5c1fcc4fd582393d02.tar.bz2
Fixes #1433, #2183. Upgrades are now tracked and will be run if needed regardless of version.
git-svn-id: http://code.elgg.org/elgg/trunk@8277 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'install')
-rw-r--r--install/ElggInstaller.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 7b3fbb9ec..fc0eff0ab 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -551,7 +551,7 @@ class ElggInstaller {
protected function getNextStepUrl($currentStep) {
global $CONFIG;
$nextStep = $this->getNextStep($currentStep);
- return elgg_get_site_url()."install.php?step=$nextStep";
+ return elgg_get_site_url() . "install.php?step=$nextStep";
}
/**
@@ -1030,7 +1030,7 @@ class ElggInstaller {
require_once(dirname(__FILE__) . "/ElggRewriteTester.php");
$tester = new ElggRewriteTester();
- $url = elgg_get_site_url()."rewrite.php";
+ $url = elgg_get_site_url() . "rewrite.php";
$report['rewrite'] = array($tester->run($url, $CONFIG->path));
}
@@ -1304,6 +1304,10 @@ class ElggInstaller {
datalist_set('default_site', $site->getGUID());
datalist_set('version', get_version());
+ // new installations have run all the upgrades
+ $upgrades = elgg_get_upgrade_files($submissionVars['path'] . 'engine/lib/upgrades/');
+ datalist_set('processed_upgrades', serialize($upgrades));
+
set_config('view', 'default', $site->getGUID());
set_config('language', $submissionVars['language'], $site->getGUID());
set_config('default_access', $submissionVars['siteaccess'], $site->getGUID());