Skip to content

Commit

Permalink
set version to 0.9.35.1; fix updater :x
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kaufmann (d00p) <[email protected]>
  • Loading branch information
d00p committed Apr 8, 2016
1 parent 57f9c43 commit 5331127
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion admin_updates.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}
}

if (hasDbUpdates($dbversion)) {
if (hasDbUpdates($dbversion) || hasUpdates($version)) {
$successful_update = false;
$message = '';

Expand Down
2 changes: 1 addition & 1 deletion install/froxlor.sql
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_numeric', '0'),
('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'version', '0.9.35'),
('panel', 'version', '0.9.35.1'),

This comment has been minimized.

Copy link
@kroimon

kroimon Apr 9, 2016

Why not use the $version variable from lib/version.inc.php here?

This comment has been minimized.

Copy link
@d00p

d00p Apr 9, 2016

Author Member

Because it's a static SQL file which is being imported when installing

This comment has been minimized.

Copy link
@kroimon

kroimon Apr 9, 2016

Oops, my bad. Somehow thought it was parsed before being used.

('panel', 'db_version', '201603150');


Expand Down
8 changes: 8 additions & 0 deletions install/updates/froxlor/0.9/update_0.9.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -3284,3 +3284,11 @@

updateToVersion('0.9.35');
}

if (isFroxlorVersion('0.9.35')) {

showUpdateStep("Updating from 0.9.35 to 0.9.35.1");
lastStepStatus(0);

updateToVersion('0.9.35.1');
}
2 changes: 1 addition & 1 deletion lib/version.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

// Main version variable
$version = '0.9.35';
$version = '0.9.35.1';

// Database version (YYYYMMDDC where C is a daily counter)
$dbversion = '201603150';
Expand Down

0 comments on commit 5331127

Please sign in to comment.