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

Merge working branch to dev

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-28 05:43:08 -04:00
parent fa1b58c6a2 b4f2dda5fa
commit a5b1110c1f
19 changed files with 1269 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wire/modules/PageRender.module
View File

@@ -500,7 +500,10 @@ class PageRender extends WireData implements Module, ConfigurableModule {
// own additional variables in it if they want to
$output->set('options', $options);
$profiler = $this->wire('profiler');
$profilerEvent = $profiler ? $profiler->start($page->path, $this, array('page' => $page)) : null;
$data = $output->render();
if($profilerEvent) $profiler->stop($profilerEvent);
}
if($data && $cacheAllowed && $cacheFile) $cacheFile->save($data);

19
wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
View File

@@ -95,6 +95,7 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule {
'flipHorizontal' => $this->_('Flip horizontal'),
'flipVertical' => $this->_('Flip vertical'),
'noAccess' => $this->_('You do not have access to edit images on this page.'),
'demoMode' => "Image editing functions are disabled in demo mode",
);
}
@@ -106,7 +107,12 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule {
*/
public function init() {
if($this->config->demo) throw new WireException("Sorry, image editing functions are disabled in demo mode");
// throw new WireException($this->labels['demoMode']);
if($this->config->demo) {
if($this->wire('input')->urlSegmentStr != 'variations') {
throw new WireException($this->labels['demoMode']);
}
}
$this->modules->get("ProcessPageList");
@@ -1323,7 +1329,16 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule {
$this->wire('modules')->get('JqueryMagnific');
return "<br />" . $form->render();
$out = $form->render();
if($this->wire('config')->demo) {
$out = "<p class='detail'>Note: " . $this->labels['demoMode'] . "</p>" . $out;
} else {
$out = "<br />" . $out;
}
return $out;
}
/**