commit 2a0c376638809aea78181b7d25c61247ce30969e
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Jun 8 11:45:28 2018 +0200
- rel 13; one more fix
escape.patch | 9 ++++-----
php-propel.spec | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/php-propel.spec b/php-propel.spec
index 67be754..3bedbef 100644
--- a/php-propel.spec
+++ b/php-propel.spec
@@ -4,7 +4,7 @@ Summary: Object persistence and query service for PHP5
Summary(pl.UTF-8): Usługa przechowywania i odpytywania obiektów dla PHP5
Name: php-%{pkgname}
Version: 1.4.2
-Release: 12
+Release: 13
License: LGPL v3
Group: Development/Languages/PHP
Source0: http://files.propelorm.org/%{pkgname}-%{version}.tar.gz
diff --git a/escape.patch b/escape.patch
index 7d56867..9b1ca0f 100644
--- a/escape.patch
+++ b/escape.patch
@@ -1,5 +1,5 @@
--- a/runtime/classes/propel/util/BasePeer.php 2018-06-08 09:24:24.133168452
+0200
-+++ b/runtime/classes/propel/util/BasePeer.php 2018-06-08 10:26:40.142239018
+0200
++++ a/runtime/classes/propel/util/BasePeer.php 2018-06-08 11:36:57.364405761
+0200
@@ -353,8 +353,13 @@
$stmt = null;
@@ -16,7 +16,7 @@
$p = 1;
foreach ($updateTablesColumns[$tableName] as
$col) {
$updateColumnName = substr($col,
strrpos($col, '.') + 1);
-@@ -886,15 +891,19 @@
+@@ -886,7 +891,11 @@
$condition .= ' AND ';
}
}
@@ -29,12 +29,11 @@
// add 'em to the queues..
if ($joinType = $join->getJoinType()) {
// real join
- if (!$fromClause) {
+@@ -894,7 +903,7 @@
$fromClause[] = $leftTable .
$leftTableAlias;
}
-- $joinTables[] = $rightTable . $rightTableAlias;
+ $joinTables[] = $rightTable . $rightTableAlias;
- $joinClause[] = $join->getJoinType() . ' ' .
$rightTable . $rightTableAlias . " ON ($condition)";
-+ $joinTables[] = $_rightTable . $rightTableAlias;
+ $joinClause[] = $join->getJoinType() . ' ' .
$_rightTable . $rightTableAlias . " ON ($condition)";
} else {
// implicit join, translates to a where
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-propel.git/commitdiff/2a0c376638809aea78181b7d25c61247ce30969e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
