keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for duplicated addon entries in the hook table (#5583)

Browse source
This commit is contained in:
Michael Vogel 2018-08-07 23:03:38 +02:00 committed by Hypolite Petovan
parent eaf81e5e66
commit 9eb2c2ec16
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Core/Addon.php
View file

@ -139,6 +139,8 @@ class Addon
*/ */
public static function registerHook($hook, $file, $function, $priority = 0) public static function registerHook($hook, $file, $function, $priority = 0)
{ {
$file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function]; $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
$exists = DBA::exists('hook', $condition); $exists = DBA::exists('hook', $condition);
if ($exists) { if ($exists) {
@ -160,7 +162,13 @@ class Addon
*/ */
public static function unregisterHook($hook, $file, $function) public static function unregisterHook($hook, $file, $function)
{ {
$relative_file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
// This here is only needed for fixing a problem that existed on the develop branch
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function]; $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
DBA::delete('hook', $condition);
$condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
$r = DBA::delete('hook', $condition); $r = DBA::delete('hook', $condition);
return $r; return $r;
} }