- rel 13; one more fix

diff --git a/escape.patch b/escape.patch
index 7d568671bd9df16ecb494a80f3ff3d0f3d482f1d..9b1ca0f7135b044b2ff823840efa196ddaa0ad6f 100644 (file)
--- 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

diff --git a/php-propel.spec b/php-propel.spec
index 67be75430f440abfc05360cd2116fdab61c8aacf..3bedbef492d55dd52c66964ba9823940b1c30cc7 100644 (file)
--- 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