Merge pull request #272 from bergware/6.4-wip

Fixed regression error in Docker settings
This commit is contained in:
tom mortensen
2018-03-01 08:55:01 -08:00
committed by GitHub
2 changed files with 3 additions and 2 deletions
@@ -136,7 +136,7 @@ span.disabled{color:#404040}
<input type="hidden" name="#include" value="/plugins/dynamix.docker.manager/include/PruneConfig.php">
<input type="hidden" name="#command" value="/plugins/dynamix/scripts/emhttpd_update">
<input type="hidden" name="#cleanup" value="true">
<input type="hidden" name="DOCKER_CUSTOM_NETWORKS" value="<?=implode(' ',$unset)?>">
<input type="hidden" name="DOCKER_CUSTOM_NETWORKS" value="<?=implode(' ',$unset)?> ">
Enable Docker:
: <select id="DOCKER_ENABLED" name="DOCKER_ENABLED" class="narrow">
<?=mk_option($dockercfg['DOCKER_ENABLED'], 'no', 'No')?>
+2 -1
View File
@@ -22,7 +22,8 @@ $version = $date = 'unknown';
if (file_exists('/boot/previous/changes.txt')) {
exec("head -n4 /boot/previous/changes.txt",$rows);
foreach ($rows as $row) {
if ($i = stripos($row,'version')!==false) {
$i = stripos($row,'version');
if ($i !== false) {
list($version,$date) = explode(' ',trim(substr($row,$i+7)));
break;
}