Author: ralfbecker
New Revision: 55554
URL: http://svn.stylite.de/viewvc/egroupware?rev=55554&view=rev
Log:
fix An error happened (ErrorException): Argument 4 passed to EGroupware\Api\Vfs::copy_files() must be of the type array, none given
Modified:
branches/14.2/egroupware/api/src/Vfs.php
branches/14.2/phpgwapi/inc/class.egw_sharing.inc.php
— branches/14.2/egroupware/api/src/Vfs.php (original)
+++ branches/14.2/egroupware/api/src/Vfs.php Tue Mar 29 14:21:11 2016
@@ -1959,8 +1959,11 @@
*
* @param array $src contains the source file
* @param string $dst is the destination directory
- */
- static public function copy_files(array $src, $dst, &$errs, array &$copied)
-
-
@param int& $errs =null on return number of errors happened
-
-
@param array& $copied =null on return files copied
-
-
@return boolean true for no errors, false otherwise
- */
- static public function copy_files(array $src, $dst, &$errs=null, array &$copied=null)
{
if (self::is_dir($dst))
{
— branches/14.2/phpgwapi/inc/class.egw_sharing.inc.php (original)
+++ branches/14.2/phpgwapi/inc/class.egw_sharing.inc.php Tue Mar 29 14:21:11 2016
@@ -441,7 +441,7 @@
if ($mode == ‘link’)
{
$user_tmp = ‘/home/’.$GLOBALS[‘egw_info’][‘user’][‘account_lid’].’/.tmp’;
@@ -449,7 +449,7 @@
do {
$tmp_file = egw_vfs::concat($user_tmp, ($n?$n.’.’:’’).egw_vfs::basename($name));
}
-
while(!(is_dir($path) && egw_vfs::mkdir($tmp_file, null, STREAM_MKDIR_RECURSIVE) ||
!is_dir($path) && (!egw_vfs::file_exists($tmp_file) && ($fp = egw_vfs::fopen($tmp_file, 'x')) ||
// do not copy identical files again to users tmp dir, just re-use them
egw_vfs::file_exists($tmp_file) && egw_vfs::compare(egw_vfs::PREFIX.$tmp_file, $path))) && $n++ < 100);
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
