Skip to content

Commit

Permalink
merge in patch from propelorm#1082
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidGoodwin committed May 7, 2020
1 parent 9669018 commit cd44103
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion generator/lib/config/GeneratorConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function getClassname($propname)
// Basically, we want to turn ?.?.?.sqliteDataSQLBuilder into ?.?.?.SqliteDataSQLBuilder
$lastdotpos = strrpos($classpath, '.');
if ($lastdotpos !== false) {
$classpath{$lastdotpos + 1} = strtoupper($classpath{$lastdotpos + 1});
$classpath[$lastdotpos + 1] = strtoupper($classpath[$lastdotpos + 1]);
} else {
// Allows to configure full classname instead of a dot-path notation
if (class_exists($classpath)) {
Expand Down
2 changes: 1 addition & 1 deletion generator/lib/config/QuickGeneratorConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function parsePseudoIniFile($filepath)
}
foreach ($lines as $line) {
$line = trim($line);
if ($line == "" || $line{0} == '#' || $line{0} == ';') {
if ($line == "" || $line[0] == '#' || $line[0] == ';') {
continue;
}
$pos = strpos($line, '=');
Expand Down
4 changes: 2 additions & 2 deletions runtime/lib/util/BasePeer.php
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,10 @@ public static function doUpdate(Criteria $selectCriteria, Criteria $updateValues
$rawcvt = '';
// parse the $params['raw'] for ? chars
for ($r = 0, $len = strlen($raw); $r < $len; $r++) {
if ($raw{$r} == '?') {
if ($raw[$r] == '?') {
$rawcvt .= ':p' . $p++;
} else {
$rawcvt .= $raw{$r};
$rawcvt .= $raw[$r];
}
}
$sql .= $rawcvt . ', ';
Expand Down

0 comments on commit cd44103

Please sign in to comment.