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

Fix issue processwire/processwire-issues#377 where install of non-native site profile with 3rd party Fieldtype modules could produce error messages at install time

Browse Source
This commit is contained in:
Ryan Cramer
2017-09-20 06:43:38 -04:00
parent 2a3be7209c
commit 4560ed2997
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install.php
View File

@@ -109,6 +109,7 @@ class Installer {
case 5: require("./index.php"); case 5: require("./index.php");
/** @var ProcessWire $wire */ /** @var ProcessWire $wire */
$wire->modules->refresh();
$this->adminAccountSave($wire); $this->adminAccountSave($wire);
break; break;

8
wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module
View File

@@ -145,7 +145,7 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule {
// make sure that all templates used by repeater pages enforce a Page type of RepeaterPage // make sure that all templates used by repeater pages enforce a Page type of RepeaterPage
foreach($fields as $field) { foreach($fields as $field) {
if($field->type->className() != $className) continue; if(!$field->type || $field->type->className() != $className) continue;
$template = $this->getRepeaterTemplate($field); $template = $this->getRepeaterTemplate($field);
if(!$template) continue; if(!$template) continue;
if(__NAMESPACE__) { if(__NAMESPACE__) {
@@ -910,11 +910,11 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule {
foreach($changesByField as $fieldName => $count) { foreach($changesByField as $fieldName => $count) {
$updateCounts[] = "$fieldName ($count)"; $updateCounts[] = "$fieldName ($count)";
} }
$messages[] = "$numUpdated '$fieldName' page(s) updated – " . implode(', ', $updateCounts); $messages[] = "$numUpdated page(s) updated – " . implode(', ', $updateCounts);
} }
if($numAdded) $messages[] = "$numAdded new '$fieldName' page(s) added"; if($numAdded) $messages[] = "$numAdded new page(s) added";
if($numDeleted) $messages[] = "$numDeleted '$fieldName' page(s) DELETED"; if($numDeleted) $messages[] = "$numDeleted page(s) DELETED";
foreach($messages as $message) { foreach($messages as $message) {
$pageArray->message("$field->name: $message"); $pageArray->message("$field->name: $message");