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.

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

Feature/4087 merge templates improvments into 2.x #4088

Merged
merged 6 commits into from
Mar 27, 2017
Merged

Feature/4087 merge templates improvments into 2.x #4088

merged 6 commits into from
Mar 27, 2017

Conversation

pglewis
Copy link
Contributor

@pglewis pglewis commented Mar 25, 2017 •
edited
Loading

jamesgol and others added 6 commits March 25, 2017 11:49
@jamesgol @pglewis
Tame the template reference recursion
3871c4c 
This cleans up the code quite a bit.  Still not perfect and the ordering might need to be adjusted a bit but it will keep everything from exploding.

Related to #3370

Also includes #3992 since it covers the same functions

(cherry picked from commit 2238813)
@jamesgol @pglewis
Change method of short circuiting WordPress shortcodes
e9562e3 
In this new way we don't unset all of the un-needed shortcodes, just add a temporary filter that stops it from executing.

(cherry picked from commit d80fe34)
@jamesgol @pglewis
Fix typo
9dcc705 
No I'm not stuttering

(cherry picked from commit c1c0758)
@jamesgol @pglewis
Add blank line
839d1f4 
Trying out using github's editor here, wonder if it will mess up any other spacing

(cherry picked from commit c19b28a)
@sc0ttkclark @pglewis
Remove extra space
f0c4055 
(cherry picked from commit f515a98)
@jamesgol @pglewis
Only run auto templates if inside the WordPress loop
3b72977 
Adds configuration setting to override and allow to run outside of loop.

(cherry picked from commit a09b677)
@pglewis pglewis added this to the Pods 2.6.8.1 milestone Mar 25, 2017
@pglewis pglewis self-assigned this Mar 25, 2017
@pglewis pglewis added the Status: In Progress Issue or PR is currently in progress but not yet done label Mar 25, 2017
@pglewis
Copy link
Contributor Author

pglewis commented Mar 25, 2017

@jamesgol: I think I got all the related commits that went into 2.7 but not 2.x. Let me know if there are any I missed that should be included or if there are any probs with merging these pieces.

jamesgol
jamesgol approved these changes Mar 26, 2017
View reviewed changes
Copy link
Contributor

@jamesgol jamesgol left a comment

Choose a reason for hiding this comment

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

That should be all of them that are out there now.

@pglewis pglewis merged commit 6d7f284 into 2.x Mar 27, 2017
@pglewis pglewis deleted the feature/4087-merge-templates-improvments-into-2.x branch March 27, 2017 16:44
@pglewis pglewis removed the Status: In Progress Issue or PR is currently in progress but not yet done label Mar 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jamesgol jamesgol jamesgol approved these changes

Assignees

@pglewis pglewis

Labels
None yet
Projects
None yet
Milestone
Pods 2.6.9
Development

Successfully merging this pull request may close these issues.
3 participants
@pglewis @sc0ttkclark @jamesgol