Skip to content

Tweak PR 337/8 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
mambax7 merged 2 commits into from
Feb 11, 2017
Merged

Tweak PR 337/8 #1

mambax7 merged 2 commits into from
Feb 11, 2017

Conversation

@geekwright
Copy link

@geekwright geekwright commented Feb 11, 2017

Can you merge this on your branch, so I can pull XOOPS#337 and ingore XOOPS#338 ?

There are a few potential merge issues that I'm trying to avoid. Thanks!

@geekwright
Change default to use custom session
66ea556 
Merged with other ongoing changes to simplify things
including XOOPS#337 and XOOPS#338
@geekwright
Reverting
b3d897f 
Other efforts have major changes to this file and dealing with
the inevitable conflicts are not worth it.
@mambax7 mambax7 merged commit 0d61749 into mambax7:feature/Undefined_method Feb 11, 2017
@geekwright geekwright deleted the mamba337 branch February 11, 2017 21:23
@geekwright
Copy link
Author

geekwright commented Feb 11, 2017

Thanks!

mambax7 pushed a commit that referenced this pull request Feb 13, 2017
@GregMage
Merge pull request #1 from geekwright/multiple_images
100be1b 
Tweaks for issues
mambax7 pushed a commit that referenced this pull request Feb 29, 2020
@geekwright
Merge pull request #1 from GregMage/xmcontent
ae11cef 
Adding templates for Xmcontent
mambax7 added a commit that referenced this pull request Nov 15, 2020
@mambax7
Countable
db0ba63 
Error: TypeError: count(): Argument #1 ($var) must be of type Countable|array, string given in file /modules/system/admin/blocksadmin/main.php line 284
mambax7 pushed a commit that referenced this pull request Mar 7, 2021
@geekwright
PHP 8 fix for issue discovered in testing
e49f163 
Error : ValueError: mt_rand(): Argument #2 ($max) must be
greater than or equal to argument #1 ($min)

Also, some simple cleanups.
mambax7 added a commit that referenced this pull request Jan 24, 2022
@mambax7
Unknown: htmlspecialchars(): Passing null to parameter #1 ($string) …
027d3cb 
…of type string is deprecated in file /class/xoopsform/formelement.php line 160
mambax7 added a commit that referenced this pull request Jan 24, 2022
@mambax7
Unknown: htmlspecialchars(): Passing null to parameter #1 ($string) …
b95db59 
…of type string is deprecated in file /class/xoopsform/formelement.php line 160
mambax7 pushed a commit that referenced this pull request Mar 27, 2022
@montuy337513 @geekwright
Fix bug issue XOOPS#1114
b18879a 
Unknown: strip_tags(): Passing null to parameter #1 ($string) of type string is deprecated in file /class/xoopsform/formelement.php line 265

Unknown: trim(): Passing null to parameter #1 ($string) of type string is deprecated in file /class/xoopsform/formelement.php line 276
mambax7 added a commit that referenced this pull request Apr 8, 2022
@mambax7
Passing null to parameter #1 ($string) of type string is deprecated i…
11a9232 
…n file /class/xoopsform/formelement.php line 160
mambax7 pushed a commit that referenced this pull request Apr 9, 2022
@geekwright
Merge pull request XOOPS#1211 from mambax7/feature/php81_formelement
9f99843 
Passing null to parameter #1 ($string) of type string is deprecated
mambax7 pushed a commit that referenced this pull request Oct 6, 2025
@ggoffy
Merge pull request #1 from XOOPS/master
d17a607 
merge with master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@geekwright @mambax7