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

Additional updates for processwire/processwire-issues#1467

Browse Source
This commit is contained in:
Ryan Cramer
2022-05-09 11:56:53 -04:00
parent d3a5b4170a
commit 14a9b92c70
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wire/core/Functions.php
View File

@@ -811,6 +811,7 @@ function wireClassName($className, $withNamespace = false, $verbose = false) {
$object = null; $object = null;
} }
$className = (string) $className;
$pos = strrpos($className, $bs); $pos = strrpos($className, $bs);
if($withNamespace === true) { if($withNamespace === true) {

2
wire/core/Password.php
View File

@@ -246,7 +246,7 @@ class Password extends Wire {
} else { } else {
// older style, non-blowfish support // older style, non-blowfish support
// split the password in two // split the password in two
$splitPass = str_split($pass, (strlen($pass) / 2) + 1); $splitPass = str_split($pass, (int) (strlen($pass) / 2) + 1);
// generate the hash // generate the hash
$hash = hash($hashType, $salt1 . $splitPass[0] . $salt2 . $splitPass[1], false); $hash = hash($hashType, $salt1 . $splitPass[0] . $salt2 . $splitPass[1], false);
} }

2
wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module
View File

@@ -716,7 +716,7 @@ class InputfieldRepeater extends Inputfield implements InputfieldItemList {
$addLabel = $this->field->get("repeaterAddLabel$language"); $addLabel = $this->field->get("repeaterAddLabel$language");
} }
} }
if(!strlen($addLabel)) $addLabel = $this->_('Add New'); if(!strlen("$addLabel")) $addLabel = $this->_('Add New');
return $addLabel; return $addLabel;
} }

2
wire/modules/PagePermissions.module
View File

@@ -860,7 +860,7 @@ class PagePermissions extends WireData implements Module {
$_ADDABLE = false; // if we really mean it (as in, do not perform secondary checks) $_ADDABLE = false; // if we really mean it (as in, do not perform secondary checks)
$superuser = $user->isSuperuser(); $superuser = $user->isSuperuser();
if($page->template->noChildren) { if($page->template && $page->template->noChildren) {
$addable = false; $addable = false;
} else if($superuser) { } else if($superuser) {

1
wire/modules/Process/ProcessPageLister/ListerBookmarks.php
View File

@@ -600,6 +600,7 @@ class ListerBookmarks extends Wire {
$bookmarkID = $bookmark['id']; $bookmarkID = $bookmark['id'];
} else { } else {
$type = self::typePublic; $type = self::typePublic;
$bookmarkID = (string) $bookmarkID;
$ownedPrefix = $this->typePrefix(self::typeOwned); $ownedPrefix = $this->typePrefix(self::typeOwned);
if(strpos($bookmarkID, $ownedPrefix) !== false) { if(strpos($bookmarkID, $ownedPrefix) !== false) {
list($userID, $bookmarkID) = explode($ownedPrefix, $bookmarkID); list($userID, $bookmarkID) = explode($ownedPrefix, $bookmarkID);