[Tikiwiki-cvs] tiki/lib tikilib.php,1.618,1.619

[<rlp...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27130/lib

Modified Files:
	tikilib.php 
Log Message:
Fixed two *major* bugs with wiki attachments.


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -d -r1.618 -r1.619
--- tikilib.php	16 Oct 2005 14:35:09 -0000	1.618
+++ tikilib.php	20 Oct 2005 23:29:41 -0000	1.619
@@ -6483,6 +6483,7 @@
 		$fp = fopen($tmp_dest, "rb");
 		$data = '';
 		$fhash = '';
+		$chunk = '';
 		if ($store_type == 'dir') {
 			$fhash = md5($name = $file_name);    
 			$fw = fopen($w_use_dir.$fhash, "wb");
@@ -6490,12 +6491,13 @@
 			    return array("ok"=>false, "error"=>tra('Cannot write to this file:').$fhash);
 		}
 		while(!feof($fp)) {
+			$chunk = fread($fp, 8192*16);
+
 			if ($store_type == 'dir') {
-				$data .= fread($fp, 8192*16);
-				fwrite($fw, $data);
-			} else {
-				$data = fread($fp, 8192*16);
+				fwrite($fw, $chunk);
 			}
+
+			$data .= $chunk;
 		}
 		fclose($fp);
 		unlink($tmp_dest);