mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
Fix error "Non-static method Merge::get_all_ids() cannot be called statically"
This commit is contained in:
parent
7248b6649b
commit
309e020324
@ -2841,7 +2841,7 @@ abstract class Merge
|
|||||||
*
|
*
|
||||||
* @param Api\Contacts\Merge $merge App-specific merge object
|
* @param Api\Contacts\Merge $merge App-specific merge object
|
||||||
*/
|
*/
|
||||||
protected function get_all_ids(Api\Storage\Merge $merge)
|
protected static function get_all_ids(Api\Storage\Merge $merge)
|
||||||
{
|
{
|
||||||
$ids = array();
|
$ids = array();
|
||||||
$locations = array('index', 'session_data');
|
$locations = array('index', 'session_data');
|
||||||
|
Loading…
Reference in New Issue
Block a user