diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-31 17:50:47 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-31 17:50:47 -0700 |
| commit | dfb6255f59980835d364402b372dd39f2b41ee7c (patch) | |
| tree | f8d97437d713311a9cd3cf13e0e8faa5b617fa8f /Zotlabs/Module/Settings.php | |
| parent | 00b4843425371e4ff55c82be577a279e248c29fc (diff) | |
| download | volse-hubzilla-dfb6255f59980835d364402b372dd39f2b41ee7c.tar.gz volse-hubzilla-dfb6255f59980835d364402b372dd39f2b41ee7c.tar.bz2 volse-hubzilla-dfb6255f59980835d364402b372dd39f2b41ee7c.zip | |
more removal of reserved words from DB schemas
Diffstat (limited to 'Zotlabs/Module/Settings.php')
| -rw-r--r-- | Zotlabs/Module/Settings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 5687ce84b..43162a2b0 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -78,7 +78,7 @@ class Settings extends \Zotlabs\Web\Controller { $r = q("UPDATE clients SET client_id='%s', pw='%s', - name='%s', + clname='%s', redirect_uri='%s', icon='%s', uid=%d @@ -91,7 +91,7 @@ class Settings extends \Zotlabs\Web\Controller { intval(local_channel()), dbesc($key)); } else { - $r = q("INSERT INTO clients (client_id, pw, name, redirect_uri, icon, uid) + $r = q("INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid) VALUES ('%s','%s','%s','%s','%s',%d)", dbesc($key), dbesc($secret), @@ -615,7 +615,7 @@ class Settings extends \Zotlabs\Web\Controller { '$title' => t('Add application'), '$submit' => t('Update'), '$cancel' => t('Cancel'), - '$name' => array('name', t('Name'), $app['name'] , ''), + '$name' => array('name', t('Name'), $app['clname'] , ''), '$key' => array('key', t('Consumer Key'), $app['client_id'], ''), '$secret' => array('secret', t('Consumer Secret'), $app['pw'], ''), '$redirect' => array('redirect', t('Redirect'), $app['redirect_uri'], ''), |