Skip to content
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.

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

Stuff #3377

Merged
merged 18 commits into from
Apr 21, 2016
Merged

Stuff #3377

merged 18 commits into from
Apr 21, 2016

Conversation

MissAllSunday
Copy link
Contributor

  • fixes an issue with minify changing vars making unable to collapse categories
  • Change code in Sources/ModerationCenter.php to be php 5.3 compatible
  • renamed a few vars to avoid possible var name collision.
  • Move a check for atachment previous, prevents undefined errors if no attachment was found.

Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
making smf_setThemeOption() to save the wrong var

Signed-off-by: Jessica González <suki@missallsunday.com>
fixes SimpleMachines#3376

Signed-off-by: Jessica González <suki@missallsunday.com>
$smcFunc['db_free_result']($get_owner);

$note_owner = $note_owner['id_member'];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$note_owner[0]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait... that entire line shouldn't be there unless you get rid of list().

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes

Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
fixes SimpleMachines#3381

Signed-off-by: Jessica González <suki@missallsunday.com>
@live627
Copy link
Contributor

live627 commented Apr 7, 2016

Is this okay to get merged?

Signed-off-by: Jessica González <suki@missallsunday.com>
@MissAllSunday
Copy link
Contributor Author

not yet sadly, still need to push some more stuff

Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
Signed-off-by: Jessica González <suki@missallsunday.com>
@MissAllSunday MissAllSunday merged commit 61c4964 into SimpleMachines:release-2.1 Apr 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants