GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Memcached_DataObject] Thorough check of pivotGetClass arguments

This commit is contained in:
Alexei Sorokin 2020-08-12 13:50:39 +03:00 committed by Diogo Peralta Cordeiro
parent dd8612c39a
commit 668bdc7a6d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/Memcached_DataObject.php
View File

@ -160,10 +160,20 @@ class Memcached_DataObject extends Safe_DataObject
* *
* @return array Array mapping $keyVals to objects, or null if not found * @return array Array mapping $keyVals to objects, or null if not found
*/ */
public static function pivotGetClass($cls, $keyCol, array $keyVals, array $otherCols = []) public static function pivotGetClass(
{ $cls,
$keyCol,
array $keyVals,
array $otherCols = []
) {
if (is_array($keyCol)) { if (is_array($keyCol)) {
foreach ($keyVals as $keyVal) { foreach ($keyVals as $keyVal) {
if (!is_array($keyVal)) {
throw new ServerException(
'keyVals passed to pivotGet must be an array of arrays '
. 'if keyCol is an array'
);
}
$result[implode(',', $keyVal)] = null; $result[implode(',', $keyVal)] = null;
} }
} else { } else {
@ -595,7 +605,7 @@ class Memcached_DataObject extends Safe_DataObject
return $ckeys; return $ckeys;
} }
public static function multicache($cls, $kv) public static function multicache($cls, array $kv)
{ {
ksort($kv); ksort($kv);
$c = self::memcache(); $c = self::memcache();
@ -606,7 +616,7 @@ class Memcached_DataObject extends Safe_DataObject
} }
} }
public static function multicacheKey($cls, $kv) public static function multicacheKey($cls, array $kv)
{ {
ksort($kv); ksort($kv);
$pkeys = implode(',', array_keys($kv)); $pkeys = implode(',', array_keys($kv));