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

joinAdd calls DB_DataObject::factory directly so no GS_DataObject override

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-06-06 19:41:23 +02:00
parent daaafd86e2
commit 06503cc11b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
classes/GS_DataObject.php
View File

@ -137,6 +137,20 @@ class GS_DataObject extends DB_DataObject
return $res; return $res;
} }
// DB_DataObject's joinAdd calls DB_DataObject::factory explicitly, so our factory-override doesn't work
public function joinAdd($obj = false, $joinType='INNER', $joinAs=false, $joinCol=false)
{
// avoid those annoying PEAR::DB strict standards warnings it causes
$old = error_reporting();
error_reporting(error_reporting() & ~E_STRICT);
$res = parent::joinAdd($obj, $joinType, $joinAs, $joinCol);
// reset
error_reporting($old);
return $res;
}
public function links() public function links()
{ {
// avoid those annoying PEAR::DB strict standards warnings it causes // avoid those annoying PEAR::DB strict standards warnings it causes