Fixed issue #10 Links to sub calls now work

Fixed issue #11 Line numbers in fileviewer

3 files changed, 4 insertions, 4 deletions

diff --git a/index.php b/index.php
index 93c9bc1..10e3ffb 100644
--- a/index.php
+++ b/index.php
@@ -99,7 +99,7 @@ switch(get('op')){
 			$invo = $reader->getCalledFromInfo($functionNr, $i);
 			$foundInvocations += $invo['callCount'];
 			$callerInfo = $reader->getFunctionInfo($invo['functionNr']);
-			$invo['callerFile'] = $callerInfo['file'];
+			$invo['file'] = $callerInfo['file'];
 			$invo['callerFunctionName'] = $callerInfo['functionName'];
 			$result['calledFrom'][] = $invo;
 		}
@@ -108,7 +108,7 @@ switch(get('op')){
 		for($i=0;$i<$function['subCallInfoCount'];$i++){
 			$invo = $reader->getSubCallInfo($functionNr, $i);
 			$callInfo = $reader->getFunctionInfo($invo['functionNr']);
-			$invo['callerFile'] = $callInfo['file'];
+			$invo['file'] = $function['file']; // Sub call to $callInfo['file'] but from $function['file']
 			$invo['callerFunctionName'] = $callInfo['functionName'];
 			$result['subCalls'][] = $invo;
 		}
diff --git a/templates/fileviewer.phtml b/templates/fileviewer.phtml
index c10b505..9064ee9 100644
--- a/templates/fileviewer.phtml
+++ b/templates/fileviewer.phtml
@@ -34,7 +34,7 @@
 
     	<?php 
     	    $syntax = explode('<br />', str_replace(array('<code>', '</code>'), '', highlight_file($file, true)));
-            foreach ($syntax as $num => $string): ?>
+            foreach ($syntax as $num => $string): $num++;?>
                 <span class="num" <?php if ($num==$line):?>id="line_emph"<?php endif; ?>><?php echo $num ?></span>
     			<?php echo $string; ?>
     			<br />
diff --git a/templates/index.phtml b/templates/index.phtml
index be6440d..03d50ec 100644
--- a/templates/index.phtml
+++ b/templates/index.phtml
@@ -136,7 +136,7 @@
 						<td>'+data.callerFunctionName+' @ '+data.line+'</td> \
 						<td class="nr">'+data.callCount+'</td> \
 						<td class="nr">'+data.summedCallCost+'</td> \
-						<td><a title="Open file and show line" href="'+sprintf(fileUrlFormat,data.callerFile,data.line)+'" target="_blank"><img src="img/file_line.png" alt="O"/></a></td> \
+						<td><a title="Open file and show line" href="'+sprintf(fileUrlFormat,data.file,data.line)+'" target="_blank"><img src="img/file_line.png" alt="O"/></a></td> \
 					</tr>';
 			
 		}