projects
/
Pman.MTrack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
530d87f
)
Merger.php
author
Alan Knowles
<alan@akbkhome.com>
Tue, 6 Sep 2011 07:32:40 +0000
(15:32 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Tue, 6 Sep 2011 07:32:40 +0000
(15:32 +0800)
Merger.php
patch
|
blob
|
history
diff --git
a/Merger.php
b/Merger.php
index
67e3bb1
..
330f5e7
100644
(file)
--- a/
Merger.php
+++ b/
Merger.php
@@
-144,12
+144,18
@@
class Pman_MTrack_Merger extends Pman {
$rows = array();
while (false !== ($line = fread($fh))) {
- $ar = explode("\t", $line);
-
+ $ar = explode("\t", trim($line)));
+ $rows[] = array(
+ 'added' => $ar[0],
+ 'removed' => $ar[11,
+ 'filename' => $ar[2],
+
+ )
}
-
+ fclose($fh);
+ $this->jdata($rows);
echo stream_get_contents($fh);