Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
0f5ebb9b5a
9
boot.php
9
boot.php
@ -1574,8 +1574,13 @@ function proc_run($cmd){
|
|||||||
$args[$x] = escapeshellarg($args[$x]);
|
$args[$x] = escapeshellarg($args[$x]);
|
||||||
|
|
||||||
$cmdline = implode($args," ");
|
$cmdline = implode($args," ");
|
||||||
if(is_windows())
|
|
||||||
proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
|
|
||||||
|
if(is_windows()) {
|
||||||
|
$cwd = getcwd();
|
||||||
|
$cmd = "cmd /c start \"title\" /D \"$cwd\" /b $cmdline";
|
||||||
|
proc_close(proc_open($cmd, array(), $foo));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
proc_close(proc_open($cmdline." &",array(),$foo));
|
proc_close(proc_open($cmdline." &",array(),$foo));
|
||||||
}
|
}
|
||||||
|
@ -1064,5 +1064,15 @@ class RedBrowser extends DAV\Browser\Plugin {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method takes a path/name of an asset and turns it into url
|
||||||
|
* suiteable for http access.
|
||||||
|
*
|
||||||
|
* @param string $assetName
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
protected function getAssetUrl($assetName) {
|
||||||
|
return '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
2217
view/de/messages.po
2217
view/de/messages.po
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user