Merged
Conversation
dgrammatiko
approved these changes
Jan 10, 2017
Contributor
|
I have tested this item ✅ successfully on 53548e0 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/13550. |
jeckodevelopment
approved these changes
Jan 10, 2017
Contributor
|
Thanks 👍 |
roland-d
added a commit
to roland-d/joomla-cms
that referenced
this pull request
Jan 13, 2017
…sets-option * 'staging' of github.com:roland-d/joomla-cms: (136 commits) Clean up old code in cache.php file (joomla#12183) Fixing search for MySQL (joomla#13571) Unnecessary double quotes in /libraries/joomla (joomla#13372) Some improvements in tests #3: (joomla#13402) It's 2017. Happy New Year Fixing a typo in gallery plugin language files Add stripslashes to mssql result columns. (joomla#13534) remove unneeded space from btn-group/radio/checkboxes (joomla#12003) typo (joomla#13563) Remove default value from the field params to inherit from plugin Remove multiple parameter from user field Fix name of component helper in fieldshelper (joomla#13539) remove duplicated code (joomla#13550) Fix invalid string that causes the ini file not to load (joomla#13544) Catch "expects parameter 2 to be string" error Take complete context for group lookup (joomla#13538) [Mssql] Fix syntax error when installing a language in backend (joomla#13512) Normalize #__categories table across 3 db systems and add default values (joomla#13514) Normalize #__ucm_content table across 3 db systems and add default values (joomla#13513) Update config.xml (joomla#13503) ...
rdeutz
pushed a commit
to rdeutz/joomla-cms
that referenced
this pull request
Jan 17, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of Changes
Remove leftover duplicated code from conflict fixing.
Testing Instructions
Code review.
Documentation Changes Required
None.