diff --git a/module/extension/css/common.css b/module/extension/css/common.css index 38df857d73..7d8d1fce02 100644 --- a/module/extension/css/common.css +++ b/module/extension/css/common.css @@ -1,3 +1,4 @@ .alert-link:hover {text-decoration: underline;} .alert {width: 100%; display: table;} code{padding-left:0px;} +.alert.with-icon .icon-ok-sign, .alert.with-icon .icon-info-sign{padding-top:18px;vertical-align:top;} diff --git a/module/extension/model.php b/module/extension/model.php index 6ea7b12b3a..d05166de86 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -480,9 +480,9 @@ class extensionModel extends model } if($return->errors) $return->result = 'fail'; - $return->mkdirCommands = '' . str_replace('/', DIRECTORY_SEPARATOR, $return->mkdirCommands) . ''; + $return->mkdirCommands = empty($return->mkdirCommands) ? '' : '' . str_replace('/', DIRECTORY_SEPARATOR, $return->mkdirCommands) . ''; $return->errors .= $this->lang->extension->executeCommands . $return->mkdirCommands; - if(PHP_OS == 'Linux') $return->errors .= '' . $return->chmodCommands . ''; + if(PHP_OS == 'Linux') $return->errors .= empty($return->chmodCommands) ? '' : '' . $return->chmodCommands . ''; return $return; } diff --git a/module/extension/view/uninstall.html.php b/module/extension/view/uninstall.html.php index 8bcf426f4d..5a54d3b0cf 100644 --- a/module/extension/view/uninstall.html.php +++ b/module/extension/view/uninstall.html.php @@ -30,7 +30,7 @@ -
+
{$title}"; - if(!empty($backupFile)) echo "

" . sprintf($lang->extension->backDBFile, $backupFile) . '

'; + if(!empty($backupFile)) echo "

" . sprintf($lang->extension->backDBFile, $backupFile) . '

'; if($removeCommands) { echo "

{$lang->extension->unremovedFiles}

";