Fix for doubler and double line in what=confirm

[mailer.git] / inc / extensions / ext-admins.php

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index 6b4d26badc270678ccf390a477413ccaf264d491..93f877642b856dfe99d98abbee001b64739673b6 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -67,10 +67,10 @@ switch (getExtensionMode()) {
                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` DROP `default_acl`");
 
                // Remove filters
-               unregisterFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, isExtensionDryRun());
-               unregisterFilter('do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', true, isExtensionDryRun());
-               unregisterFilter('do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', true, isExtensionDryRun());
-               unregisterFilter('do_admin_login_done', 'REHASH_ADMINS_PASSWORD', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'do_admin_login_done', 'RESET_ADMINS_LOGIN_FAILURES', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'do_admin_login_pass', 'COUNT_ADMINS_LOGIN_FAILURE', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'do_admin_login_done', 'REHASH_ADMINS_PASSWORD', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -103,7 +103,7 @@ switch (getExtensionMode()) {
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
 
                                // But allow current admin everything (THIS SHALL BE YOU!)
-                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `default_acl`='allow' WHERE `login`='".getSession('admin_login')."' LIMIT 1");
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `default_acl`='allow' WHERE `id`=".bigintval(getSession('admin_id'))." LIMIT 1");
                                addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_acls`');
                                addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admins_acls` (
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,