diff options
| author | Mario <mario@mariovavti.com> | 2021-03-09 11:02:28 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-09 11:02:28 +0000 |
| commit | 53c3d0d53d27c20bdd58c99674de0881e2b0e5e6 (patch) | |
| tree | 02380a55e91c2b59e38efbf71ff012d649bcae00 /Zotlabs/Module | |
| parent | ed981ec8e818892ee15f0971e387cd269ec59689 (diff) | |
| parent | 723d757091d55a09633d09119a7214ff64d6eff0 (diff) | |
| download | volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.tar.gz volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.tar.bz2 volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.zip | |
Merge branch 'php8' into 'dev'
Stricter parameters checks for PHP 8 support
See merge request hubzilla/core!1921
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Photo.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index ac1545644..26c6aaf40 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -116,7 +116,7 @@ class Channel_calendar extends Controller { if ($results) { // Set permissions based on tag replacements - set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, false, $private); + set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, $private); foreach ($results as $result) { $success = $result['success']; diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index bc35ac452..f3e8e4e57 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -832,7 +832,7 @@ class Item extends Controller { if($results) { // Set permissions based on tag replacements - set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private); + set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $private, $parent_item); foreach($results as $result) { $success = $result['success']; diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index ee360dac5..87697f5a7 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -180,7 +180,7 @@ class Photo extends \Zotlabs\Web\Controller { $channel = channelx_by_n($r[0]['uid']); // Now we'll see if we can access the photo - $e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1", + $e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1", dbesc($photo), intval($resolution) ); |