diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-24 11:33:00 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-24 11:33:00 +0200 |
| commit | 6e85b2acc76ef44c10c331d4a9d6f20ccb663dce (patch) | |
| tree | 73a188a26e723bd88d5805b80e0269916c0e6fe6 /phpBB/install | |
| parent | 5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b (diff) | |
| parent | 3d9b5aed46ac1c3aec4b3a068b837169748a429c (diff) | |
| download | forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.gz forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.bz2 forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.tar.xz forums-6e85b2acc76ef44c10c331d4a9d6f20ccb663dce.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index db8156a831..a0c9cf9c5c 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1669,11 +1669,23 @@ class install_install extends module WHERE module_basename = 'ucp_notifications' AND module_class = 'ucp' AND module_mode = 'notification_options'"; - $result = $db->sql_query($sql); + $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); $_module->move_module_by($row, 'move_down', 4); + + // Move OAuth module 5 down... + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'ucp_auth_link' + AND module_class = 'ucp' + AND module_mode = 'auth_link'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $_module->move_module_by($row, 'move_down', 5); } // And now for the special ones |