projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from beta to RC1
[fa-stable.git]
/
sql
/
alter2.3.php
diff --git
a/sql/alter2.3.php
b/sql/alter2.3.php
index 667181bf4bf14346c903ea6a732bc1c157b10dae..e480eda5eb12eed2e79079ffb518722d7bd42890 100644
(file)
--- a/
sql/alter2.3.php
+++ b/
sql/alter2.3.php
@@
-18,7
+18,6
@@
class fa2_3 {
function fa2_3() {
$this->description = _('Upgrade from version 2.2 to 2.3');
function fa2_3() {
$this->description = _('Upgrade from version 2.2 to 2.3');
- $this->preconf = $this->fix_extensions();
}
//
}
//
@@
-27,7
+26,7
@@
class fa2_3 {
//
function install($pref, $force)
{
//
function install($pref, $force)
{
- global $
core
_version;
+ global $
db
_version;
if (!$this->preconf)
return false;
if (!$this->preconf)
return false;
@@
-92,13
+91,14
@@
class fa2_3 {
if (!db_query($sql))
return false;
}
if (!db_query($sql))
return false;
}
- return update_company_prefs(array('version_id'=>$
core
_version), $pref);
+ return update_company_prefs(array('version_id'=>$
db
_version), $pref);
}
//
// Checking before install
//
function pre_check($pref, $force)
{
}
//
// Checking before install
//
function pre_check($pref, $force)
{
+
if ($this->beta && !$force)
$this->sql = 'alter2.3rc.sql';
if ($this->beta && !$force)
$this->sql = 'alter2.3rc.sql';
@@
-109,6
+109,7
@@
class fa2_3 {
//
function installed($pref) {
$this->beta = !check_table($pref, 'suppliers', 'tax_included');
//
function installed($pref) {
$this->beta = !check_table($pref, 'suppliers', 'tax_included');
+ $this->preconf = $this->fix_extensions();
$n = 1; // number of patches to be installed
$patchcnt = 0;
$n = 1; // number of patches to be installed
$patchcnt = 0;