Support checking the registry for table prefixed queries #1161
Conversation
This file contains 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
discordier
approved these changes
Oct 26, 2017
leofeyer
requested changes
Oct 26, 2017
| $varKey = is_array($arrOptions['value']) ? $arrOptions['value'][0] : $arrOptions['value']; | ||
| $objModel = \Model\Registry::getInstance()->fetch(static::$strTable, $varKey, $arrColumn[0]); | ||
| // Support table prefixes | ||
| $arrColumn[0] = $result = preg_replace('/^' . preg_quote(static::getTable(), '/') . '\./', '', $arrColumn[0]); |
There was a problem hiding this comment.
Is the $result = part supposed to be there?
leofeyer
requested changes
Oct 26, 2017
| @@ -175,6 +175,14 @@ public static function findByUuid($strUuid, array $arrOptions=array()) | |||
| $strUuid = \StringUtil::uuidToBin($strUuid); | |||
| } | |||
|
|
|||
| // Check in model registry (does not work by default due to UNHEX()) | |||
| $objModel = \Model\Registry::getInstance()->fetch(static::$strTable, $strUuid, 'uuid'); | |||
There was a problem hiding this comment.
Similar to
core-bundle/src/Resources/contao/models/PageModel.php
Lines 660 to 683 in b894c22
empty($arrOptions) check here, shouldn't we?
|
Updated :) |
leofeyer
approved these changes
Oct 27, 2017
|
I wonder if we should backport this to 3.5 as the non usage of the registry could be considered a bug. |
|
@Toflar What do you think? |
|
Guess there are arguments for both, pro and contra :-) I‘d be okay with backporting it.
|
leofeyer
added a commit
to contao/core
that referenced
this pull request
Feb 23, 2018
|
Backported in contao/core@36bb1a7. |
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Mar 6, 2018
Version 3.5.34 (2018-03-06) --------------------------- ### Fixed Check the registry for table prefixed queries (see contao/core-bundle#1161). ### Fixed Improve the folder hashing performance (see #8856). ### Fixed Reset the autologin hash if the username or password changes (see #8843). ### Fixed Correctly encode the sitemap URLs (see #8849).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.