Skip to content

Commit 74ee5d7

Browse files
committed
Merge branch '2.1-develop' of https://github.com/magento/magento2ce into MAGETWO-70329-2
2 parents 21a72ca + b5580f4 commit 74ee5d7

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,19 @@ To suggest documentation improvements, click [here][4].
7474
[3]: <https://github.com/magento/magento2/issues>
7575
[4]: <http://devdocs.magento.com>
7676

77+
<h3>Community Maintainers</h3>
78+
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
79+
80+
<a href="https://magento.com/magento-contributors#maintainers">
81+
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
82+
</a>
83+
84+
<h3>Top Contributors</h3>
85+
Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
86+
<a href="https://magento.com/magento-contributors">
87+
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
88+
</a>
89+
7790
<h2>Reporting security issues</h2>
7891

7992
To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:[email protected]">[email protected]</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.

lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,13 @@ public function insertForce($table, array $bind);
492492
/**
493493
* Updates table rows with specified data based on a WHERE clause.
494494
*
495+
* The $where parameter in this instance can be a single WHERE clause or an array containing a multiple. In all
496+
* instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}. In the event you use an array,
497+
* you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
498+
*
499+
* If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
500+
* parenthesis. If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
501+
*
495502
* @param mixed $table The table to update.
496503
* @param array $bind Column-value pairs.
497504
* @param mixed $where UPDATE WHERE clause(s).
@@ -928,7 +935,6 @@ public function getDateExtractSql($date, $unit);
928935
*/
929936
public function getTableName($tableName);
930937

931-
932938
/**
933939
* Build a trigger name based on table name and trigger details
934940
*

0 commit comments

Comments
 (0)