mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-15 03:05:26 +02:00
Code Issues Releases Wiki Activity

Adjustment to yesterday's FileCompiler updates that corrects a case where wire() function calls are used within include() statements

Browse Source
This commit is contained in:
Ryan Cramer
2017-01-05 13:02:12 -05:00
parent c0ef1aea92
commit 9ed0e415ed
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/core/FileCompiler.php
View File

@@ -439,7 +439,9 @@ class FileCompiler extends Wire {
$this->initRawPHP($data); $this->initRawPHP($data);
if($this->options['includes']) { if($this->options['includes']) {
$dataHash = md5($data);
$this->compileIncludes($data, $sourceFile); $this->compileIncludes($data, $sourceFile);
if(md5($data) != $dataHash) $this->initRawPHP($data);
} }
if($this->options['namespace']) { if($this->options['namespace']) {
@@ -758,7 +760,7 @@ class FileCompiler extends Wire {
} }
if($testFile) { if($testFile) {
if(strpos($testFile, '.')) { if(strrpos($testFile, '.')) {
// test contains a filename that needs extension validated // test contains a filename that needs extension validated
$parts = explode('.', $testFile); $parts = explode('.', $testFile);
$testExt = array_pop($parts); $testExt = array_pop($parts);

2
wire/templates-admin/scripts/main.js
View File

@@ -414,7 +414,7 @@ if(typeof ProcessWire != "undefined") {
alert("prompt function requires vex"); alert("prompt function requires vex");
return; return;
} }
vex.dialog.prompt({ return vex.dialog.prompt({
message: message, message: message,
placeholder: placeholder, placeholder: placeholder,
callback: func callback: func

2
wire/templates-admin/scripts/main.min.js vendored
View File

File diff suppressed because one or more lines are too long