diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-30 19:44:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-30 19:44:30 -0700 |
| commit | 6602ff83dd54d0e17c985a5f527654fc2ed83eea (patch) | |
| tree | 920d7fa37f10786e806e847cf6b59b20a42e7cb8 /Zotlabs | |
| parent | 490ab9e2c593275c0cf3d705a4ae52c6a22db4d9 (diff) | |
| download | volse-hubzilla-6602ff83dd54d0e17c985a5f527654fc2ed83eea.tar.gz volse-hubzilla-6602ff83dd54d0e17c985a5f527654fc2ed83eea.tar.bz2 volse-hubzilla-6602ff83dd54d0e17c985a5f527654fc2ed83eea.zip | |
start removing reserved words from database column names (this run: addon and hook)
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Extend/Hook.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin.php | 2 |
2 files changed, 5 insertions, 5 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), diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 8f15035d1..4cabd78ca 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1291,7 +1291,7 @@ class Admin extends \Zotlabs\Web\Controller { $admin_form = ''; - $r = q("select * from addon where plugin_admin = 1 and name = '%s' limit 1", + $r = q("select * from addon where plugin_admin = 1 and aname = '%s' limit 1", dbesc($plugin) ); |