Skip to content

Commit dddf3e5

Browse files
author
Till Brehm
committed
Update server/plugins-available/shelluser_base_plugin.inc.php
1 parent d53109a commit dddf3e5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

server/plugins-available/shelluser_base_plugin.inc.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,11 @@ private function _setup_ssh_rsa() {
477477
// Remove duplicate keys
478478
$existing_keys = @file($sshkeys, FILE_IGNORE_NEW_LINES);
479479
$new_keys = explode("\n", $userkey);
480-
$final_keys_arr = @array_merge($existing_keys, $new_keys);
480+
if(is_array($existing_keys)) {
481+
$final_keys_arr = @array_merge($existing_keys, $new_keys);
482+
} else {
483+
$final_keys_arr = $new_keys;
484+
}
481485
$new_final_keys_arr = array();
482486
if(is_array($final_keys_arr) && !empty($final_keys_arr)){
483487
foreach($final_keys_arr as $key => $val){

0 commit comments

Comments
 (0)