diff options
| author | friendica <info@friendica.com> | 2012-12-09 16:28:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-12-09 16:28:35 -0800 |
| commit | 7f7767064918e95524de324b4520943ee34e04c3 (patch) | |
| tree | 116f48e54f9fde0f62bf949df335dfbffffca7d1 /mod | |
| parent | 75ea0cfa32ea490314331100281183d775861789 (diff) | |
| download | volse-hubzilla-7f7767064918e95524de324b4520943ee34e04c3.tar.gz volse-hubzilla-7f7767064918e95524de324b4520943ee34e04c3.tar.bz2 volse-hubzilla-7f7767064918e95524de324b4520943ee34e04c3.zip | |
revise auto_update system so as not to conflict with pre-existing Friendica settings
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/admin.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php index 7da602d30..fab96ae9a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -189,7 +189,7 @@ function admin_page_summary(&$a) { '$accounts' => $accounts, '$pending' => Array( t('Pending registrations'), $pending), '$version' => Array( t('Version'), FRIENDICA_VERSION), - '$build' => get_config('system','build'), + '$build' => get_config('system','db_version'), '$plugins' => Array( t('Active plugins'), $a->plugins ) )); } @@ -431,14 +431,16 @@ function admin_page_dbsync(&$a) { $o = ''; if(argc() > 3 && intval(argv(3)) && argv(2) === 'mark') { - set_config('database', 'update_' . intval(argv(3)), 'success'); + set_config('database', 'update_r' . intval(argv(3)), 'success'); + if(intval(get_config('system','db_version')) <= intval(argv(3))) + set_config('system','db_version',intval(argv(3)) + 1); info( t('Update has been marked successful') . EOL); goaway($a->get_baseurl(true) . '/admin/dbsync'); } if(argc() > 2 && intval(argv(2))) { require_once('install/update.php'); - $func = 'update_' . intval(argv(2)); + $func = 'update_r' . intval(argv(2)); if(function_exists($func)) { $retval = $func(); if($retval === UPDATE_FAILED) { @@ -460,7 +462,7 @@ function admin_page_dbsync(&$a) { $r = q("select * from config where `cat` = 'database' "); if(count($r)) { foreach($r as $rr) { - $upd = intval(substr($rr['k'],7)); + $upd = intval(substr($rr['k'],8)); if($upd < 1139 || $rr['v'] === 'success') continue; $failed[] = $upd; |