Commit: 93795e62c389822fda2aaa15d63d1c236f4fa456 - teswiki (git)

blogger

Commit MetaInfo

• Revisión: 93795e62c389822fda2aaa15d63d1c236f4fa456 (tree)
• Tiempo: 2017-09-09 22:22:55
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2430 Remove author line from text-search target

Cambiar Resumen

• modified: lib/file.php
• modified: lib/func.php

Diferencia incremental

--- a/lib/file.php
+++ b/lib/file.php
@@ -204,6 +204,18 @@ function remove_author_info($wikitext)
 	return preg_replace('/^\s*#author\([^\n]*(\n|$)/m', '', $wikitext);
 }
 
+function remove_author_lines($lines)
+{
+	$author_head = '#author(';
+	$len = strlen($author_head);
+	for ($i = 0; $i < 5; $i++) {
+		if (substr($lines[$i], 0, $len) === $author_head) {
+			unset($lines[$i]);
+		}
+	}
+	return $lines;
+}
+
 function get_date_atom($timestamp)
 {
 	// Compatible with DATE_ATOM format

--- a/lib/func.php
+++ b/lib/func.php
@@ -345,7 +345,8 @@ function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 
 		// Search for page contents
 		foreach ($keys as $key) {
-			$b_match = preg_match($key, get_source($page, TRUE, TRUE));
+			$lines = remove_author_lines(get_source($page, TRUE, FALSE));
+			$b_match = preg_match($key, join('', $lines));
 			if ($b_type xor $b_match) break; // OR
 		}
 		if ($b_match) continue;