diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
| commit | 316fee93f7f7df92db514de961b74a71556fdb63 (patch) | |
| tree | 896fd1d53ccb3863380653d1b065c7fc4ef7a641 /Zotlabs/Extend/Hook.php | |
| parent | 1523e116b91824394244c4f76a9e105a3cecd5b6 (diff) | |
| parent | 670e83b30050201e3ac069c9dfa86a92aff2431d (diff) | |
| download | volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.gz volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.bz2 volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Extend/Hook.php')
| -rw-r--r-- | Zotlabs/Extend/Hook.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Extend/Hook.php b/Zotlabs/Extend/Hook.php index 713165faf..fc1e95367 100644 --- a/Zotlabs/Extend/Hook.php +++ b/Zotlabs/Extend/Hook.php @@ -10,7 +10,7 @@ class Hook { $function = serialize($function); } - $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d LIMIT 1", + $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `fn` = '%s' and priority = %d and hook_version = %d LIMIT 1", dbesc($hook), dbesc($file), dbesc($function), @@ -23,13 +23,13 @@ class Hook { // To aid in upgrade and transition, remove old settings for any registered hooks that match in all respects except // for priority or hook_version - $r = q("DELETE FROM `hook` where `hook` = '%s' and `file` = '%s' and `function` = '%s'", + $r = q("DELETE FROM `hook` where `hook` = '%s' and `file` = '%s' and `fn` = '%s'", dbesc($hook), dbesc($file), dbesc($function) ); - $r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`, `hook_version`) VALUES ( '%s', '%s', '%s', %d, %d )", + $r = q("INSERT INTO `hook` (`hook`, `file`, `fn`, `priority`, `hook_version`) VALUES ( '%s', '%s', '%s', %d, %d )", dbesc($hook), dbesc($file), dbesc($function), @@ -44,7 +44,7 @@ class Hook { if(is_array($function)) { $function = serialize($function); } - $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' and priority = %d and hook_version = %d", + $r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `fn` = '%s' and priority = %d and hook_version = %d", dbesc($hook), dbesc($file), dbesc($function), |