aboutsummaryrefslogtreecommitdiffstats
path: root/include/plugin.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/plugin.php')
-rwxr-xr-xinclude/plugin.php21
1 files changed, 12 insertions, 9 deletions
diff --git a/include/plugin.php b/include/plugin.php
index 96ae0e543..be4e92f03 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -300,15 +300,18 @@ function call_hooks($name, &$data = null) {
$func($data);
else
$func($a, $data);
- } else {
- // The hook should be removed so we don't process it.
- // But not until everybody gets through a timing issue
- // related to git pull and update_r1169
- // q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'",
- // dbesc($name),
- // dbesc($hook[0]),
- // dbesc($origfn)
- // );
+ }
+ else {
+
+ // Don't do any DB write calls if we're currently logging a possibly failed DB call.
+ if(! DBA::$logging) {
+ // The hook should be removed so we don't process it.
+ q("DELETE FROM hook WHERE hook = '%s' AND file = '%s' AND fn = '%s'",
+ dbesc($name),
+ dbesc($hook[0]),
+ dbesc($origfn)
+ );
+ }
}
}
}