提交: d4dfbca11989579dcbba878b5c55e52f2526f96e - pukiwiki-fork (git)

Commit MetaInfo

• 修訂: d4dfbca11989579dcbba878b5c55e52f2526f96e (tree)
• 時間: 2016-12-09 06:26:10
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2406 Create cache/autolink.dat automatically

* Create 'cache/autolink.dat' before convert_html() if needed
* Remove 'cache/autolink.dat' from the repositogy and the distribution

Change Summary

• delete: cache/autolink.dat
• modified: lib/file.php
• modified: lib/pukiwiki.php

差異

--- a/cache/autolink.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-(?:\:(?:RenameLog|config\/(?:PageReading(?:\/dict)?|plugin(?:\/(?:attach\/mime-type|referer\/config|tracker(?:\/default(?:\/(?:form|list|page))?)?))?))|PukiWiki\/1\.4(?:\/Manual(?:\/Plugin(?:\/(?:A-D|E-G|H-K|L-N|O-R|S-U|V-Z))?)?)?)
-(?!)
-

--- a/lib/file.php
+++ b/lib/file.php
@@ -871,3 +871,20 @@ function pkwk_file_get_contents($filename) {
 	flock($fp, LOCK_UN);
 	return $file;
 }
+
+/**
+ * Prepare some cache files for convert_html()
+ *
+ * * Make cache/autolink.dat if needed
+ */
+function prepare_display_materials() {
+	global $autolink;
+	if ($autolink) {
+		// Make sure 'cache/autolink.dat'
+		$file = CACHE_DIR . PKWK_AUTOLINK_REGEX_CACHE;
+		if (!file_exists($file)) {
+			// Re-create autolink.dat
+			put_lastmodified();
+		}
+	}
+}

--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -98,6 +98,7 @@ if (isset($retvars['body']) && $retvars['body'] != '') {
 	$vars['cmd']  = 'read';
 	$vars['page'] = & $base;
 
+	prepare_display_materials();
 	$body  = convert_html(get_source($base));
 }