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

Fix issue processwire/processwire-issues#1136 plus some other minor unrelated adjustments

Browse Source
This commit is contained in:
Ryan Cramer
2020-07-30 15:45:44 -04:00
parent 7503ecd781
commit b855b1f6f5
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/Fieldgroup.php
View File

@@ -42,6 +42,8 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
/** /**
* Any fields that were removed from this instance are noted so that Fieldgroups::save() can delete unused data * Any fields that were removed from this instance are noted so that Fieldgroups::save() can delete unused data
* *
* @var FieldsArray|null
*
*/ */
protected $removedFields = null; protected $removedFields = null;

2
wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc
View File

@@ -10,7 +10,7 @@ if(!defined("PROCESSWIRE_INSTALL")) die();
<!-- FOOTER --> <!-- FOOTER -->
<footer id='pw-footer' class='uk-margin'> <footer id='pw-footer' class='uk-margin'>
<div class='pw-container uk-container uk-container-center'> <div class='pw-container uk-container uk-container-center'>
<p>ProcessWire 3.x &copy; 2019</p> <p>ProcessWire 3.x &copy; 2020</p>
</div> </div>
</footer> </footer>

2
wire/modules/Jquery/JqueryUI/modal.js
View File

@@ -207,7 +207,7 @@ function pwModalWindow(href, options, size) {
function updateWindowSize() { function updateWindowSize() {
var width = jQuery(window).width(); var width = jQuery(window).width();
var height = jQuery(window).height(); var height = jQuery(window).height();
if(width == lastWidth && height == lastHeight) return; if((width == lastWidth && height == lastHeight) || !$iframe.hasClass('ui-dialog-content')) return;
var _size = size; var _size = size;
if(width <= 960 && size != 'full' && size != 'large') _size = 'large'; if(width <= 960 && size != 'full' && size != 'large') _size = 'large';
if(width <= 700 && size != 'full') _size = 'full'; if(width <= 700 && size != 'full') _size = 'full';

2
wire/modules/Jquery/JqueryUI/modal.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wire/modules/PagePermissions.module
View File

@@ -558,7 +558,7 @@ class PagePermissions extends WireData implements Module {
} else if($user->isSuperuser()) { } else if($user->isSuperuser()) {
// superuser always allowed // superuser always allowed
$viewable = true; $viewable = true;
} else if($page->process) { } else if($page->hasField('process') && $page->get('process')) {
// delegate access to permissions defined with Process module // delegate access to permissions defined with Process module
$viewable = $this->processViewable($page); $viewable = $this->processViewable($page);
} else if($page instanceof User && !$user->isGuest() && ($user->hasPermission('user-admin') || $page->id === $user->id)) { } else if($page instanceof User && !$user->isGuest() && ($user->hasPermission('user-admin') || $page->id === $user->id)) {