From: teanan <teanan>
Date: Fri, 14 Apr 2006 18:30:37 +0000 (+0900)
Subject: BugTrack2/171: 'get_source' can return flat value.
X-Git-Tag: r1_5_0_rc1~88
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=d4873c45d8cf907c951d66cbe3ee4e8331b0c9ae

BugTrack2/171: 'get_source' can return flat value.
Overheads are fewer than to join later. (Pointed out by Cue)
---

diff --git a/lib/file.php b/lib/file.php
index c3092db..d08247d 100644
--- a/lib/file.php
+++ b/lib/file.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: file.php,v 1.60 2006/04/12 15:45:26 henoheno Exp $
+// $Id: file.php,v 1.61 2006/04/14 18:30:37 teanan Exp $
 // Copyright (C)
 //   2002-2006 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -16,21 +16,26 @@ define('PKWK_MAXSHOW_CACHE', 'recent.dat');
 define('PKWK_AUTOLINK_REGEX_CACHE', 'autolink.dat');
 
 // Get source(wiki text) data of the page
-function get_source($page = NULL, $lock = TRUE)
+function get_source($page = NULL, $lock = TRUE, $join = FALSE)
 {
-	$array = array();
+	$result = $join? '' : array();
 
 	if (is_page($page)) {
 		$path  = get_filename($page);
 
 		if ($lock) {
 			$fp = @fopen($path, 'r');
-			if ($fp == FALSE) return $array;
+			if ($fp == FALSE) return $result;
 			flock($fp, LOCK_SH);
 		}
 
-		// Removing line-feeds: Because file() doesn't remove them.
-		$array = str_replace("\r", '', file($path));
+		if ($join) {
+			// Overhead is fewer.
+			$result = fread($fp, filesize($path));
+		} else {
+			// Removing line-feeds: Because file() doesn't remove them.
+			$result = str_replace("\r", '', file($path));
+		}
 
 		if ($lock) {
 			flock($fp, LOCK_UN);
@@ -38,7 +43,7 @@ function get_source($page = NULL, $lock = TRUE)
 		}
 	}
 
-	return $array;
+	return $result;
 }
 
 // Get last-modified filetime of the page