diff --git a/wire/core/Fieldgroup.php b/wire/core/Fieldgroup.php index db8449b1..634f95db 100644 --- a/wire/core/Fieldgroup.php +++ b/wire/core/Fieldgroup.php @@ -632,7 +632,10 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte if(!$inputfield) continue; if($inputfield->collapsed == Inputfield::collapsedHidden) continue; - if(!$page instanceof NullPage) $inputfield->setAttribute('value', $page->get($field->name)); + if(!$page instanceof NullPage) { + $value = $page->get($field->name); + $inputfield->setAttribute('value', $value); + } if($multiMode) { $fieldInputfields[$field->id] = $inputfield; diff --git a/wire/core/WireUpload.php b/wire/core/WireUpload.php index ffc46baf..8538faf3 100644 --- a/wire/core/WireUpload.php +++ b/wire/core/WireUpload.php @@ -330,6 +330,7 @@ class WireUpload extends Wire { $extension = strtolower($pathInfo['extension']); if(in_array($extension, $this->badExtensions)) return false; + if(strpos($extension, 'php') === 0) return false; if(in_array($extension, $this->validExtensions)) return true; return false; diff --git a/wire/modules/LanguageSupport/FieldtypePageTitleLanguage.module b/wire/modules/LanguageSupport/FieldtypePageTitleLanguage.module index de32d091..ca8dbb87 100644 --- a/wire/modules/LanguageSupport/FieldtypePageTitleLanguage.module +++ b/wire/modules/LanguageSupport/FieldtypePageTitleLanguage.module @@ -50,8 +50,8 @@ class FieldtypePageTitleLanguage extends FieldtypeTextLanguage implements Fieldt } public function getInputfield(Page $page, Field $field) { - $inputField = $this->modules->get('InputfieldPageTitle'); - return $inputField; + $inputfield = $this->modules->get('InputfieldPageTitle'); + return $inputfield; } } diff --git a/wire/modules/Markup/MarkupRSS.module b/wire/modules/Markup/MarkupRSS.module index 11d4df8d..c83d0b02 100644 --- a/wire/modules/Markup/MarkupRSS.module +++ b/wire/modules/Markup/MarkupRSS.module @@ -182,7 +182,7 @@ class MarkupRSS extends WireData implements Module, ConfigurableModule { $description = $page->get($this->itemDescriptionField); $description = $description === null ? '' : $this->ent1($this->truncateDescription($description)); - $description = ''; $out = "\t\n" . @@ -390,7 +390,7 @@ class MarkupRSS extends WireData implements Module, ConfigurableModule { $f1->addOption($field->name); $f2->addOption($field->name); - } else if($field->type instanceof FieldtypeDate) { + } else if($field->type instanceof FieldtypeDatetime) { $f3->addOption($field->name); } } diff --git a/wire/modules/Process/ProcessPageType/ProcessPageType.module b/wire/modules/Process/ProcessPageType/ProcessPageType.module index ab731bce..f9713a65 100644 --- a/wire/modules/Process/ProcessPageType/ProcessPageType.module +++ b/wire/modules/Process/ProcessPageType/ProcessPageType.module @@ -79,8 +79,8 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi */ public function init() { - $this->config->scripts->add($this->config->urls->ProcessPageType . 'ProcessPageType.js'); - $this->config->styles->add($this->config->urls->ProcessPageType . 'ProcessPageType.css'); + $this->config->scripts->add($this->config->urls('ProcessPageType') . 'ProcessPageType.js'); + $this->config->styles->add($this->config->urls('ProcessPageType') . 'ProcessPageType.css'); $this->pages = $this->wire($this->page->name); @@ -88,7 +88,7 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi // $this->error("Unable to find API variable named '{$this->page->name}' (of type: PagesType)", Notice::debug); $this->pages = $this->wire('pages'); } - + if($this->pages instanceof PagesType) { $this->template = $this->pages->getTemplate(); } @@ -332,6 +332,7 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi public function ___executeAdd() { $pageTitle = $this->page->get('title|name'); $this->breadcrumb('../', $pageTitle); + /** @var ProcessPageAdd $editor */ $editor = $this->getEditor("ProcessPageAdd"); $editor->template = $this->template; try {