mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 12:10:45 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#60 where multi-language fields weren't working correctly with multi-instance

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-31 09:30:26 -04:00
parent 0529bcc495
commit ce037f06da
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wire/core/Modules.php
View File

@@ -503,6 +503,22 @@ class Modules extends WireArray {
// attempt 2.x module in dedicated namespace or root namespace
$className = $this->getModuleNamespace($moduleName) . $moduleName;
}
if(ProcessWire::getNumInstances() > 1) {
// in a multi-instance environment, ensures that anything happening during
// the module __construct is using the right instance. necessary because the
// construct method runs before the wire instance is set to the module
$wire1 = ProcessWire::getCurrentInstance();
$wire2 = $this->wire();
if($wire1 !== $wire2) {
ProcessWire::setCurrentInstance($wire2);
} else {
$wire1 = null;
}
} else {
$wire1 = null;
$wire2 = null;
}
try {
$module = $this->wire(new $className());
@@ -511,6 +527,7 @@ class Modules extends WireArray {
$module = null;
}
if($this->debug) $this->debugTimerStop($debugKey);
if($wire1) ProcessWire::setCurrentInstance($wire1);
return $module;
}

10
wire/core/ProcessWire.php
View File

@@ -560,6 +560,16 @@ class ProcessWire extends Wire {
return self::$instances;
}
/**
* Return number of instances
*
* @return int
*
*/
public static function getNumInstances() {
return count(self::$instances);
}
/**
* Get a ProcessWire instance by ID
*

14
wire/core/WireFileTools.php
View File

@@ -765,8 +765,20 @@ class WireFileTools extends Wire {
*
*/
public function compile($file, array $options = array()) {
static $compiled = array();
if(strpos($file, '/modules/')) {
// for multi-instance support, use the same compiled version
// otherwise, require_once() statements in a file may not work as intended
// applied just to site/modules for the moment, but may need to do site/templates too
$f = str_replace($this->wire('config')->paths->root, '', $file);
if(isset($compiled[$f])) return $compiled[$f];
} else {
$f = '';
}
$compiler = new FileCompiler(dirname($file), $options);
return $compiler->compile(basename($file));
$compiledFile = $compiler->compile(basename($file));
if($f) $compiled[$f] = $compiledFile;
return $compiledFile;
}
/**