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

Post #425

Merged
merged 18 commits into from May 20, 2013
Merged

Post #425

merged 18 commits into from May 20, 2013

Conversation

joshuaadickerson
Copy link
Contributor

Fixed my Post branch. This is changes to the post controller and post.subs.php

…ery can also save a query in other occasions

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
add addPollOptions()
Change the post controller to use these new functions
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Global $user_settings
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
…ion and a little bit of code in the controller

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
…sg in a topic

Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
@joshuaadickerson
Copy link
Contributor Author

Moved it back to the controller

Also, $id_member should have been used in place of $user_info
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
@norv
Copy link
Contributor

norv commented May 20, 2013

I don't think is_ignored is moved back yet, it's in both places. :)

joshuaadickerson and others added 5 commits May 19, 2013 21:00
Signed-off-by:Joshua Dickerson <joshua.a.dickerson@gmail.com>
…ode in Post controller.

Signed-off-by: Norv <a.w.norv@gmail.com>
…ettings()

(calendar .subs functions trigger update themselves)

Signed-off-by: Norv <a.w.norv@gmail.com>
Fix $only_approved expression.
Fix template to display the message body.

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Copy link
Contributor

norv commented May 20, 2013

Thank you! It's cool to see redundancies going away one by one :)

norv added a commit that referenced this pull request May 20, 2013
@norv norv merged commit 19f3e23 into elkarte:master May 20, 2013
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.

None yet

2 participants