From 8d44b6a5a2965b37002efd26f23a7cfeb5109391 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sun, 8 Nov 2009 14:33:22 +0100 Subject: Fix bug 1962: deleteuser.php regression when OpenID plugin not enabled The User_openid data object was explicitly listed as a related field to delete from in User::delete(); this class doesn't exist anymore by default since OpenID was broken out to a plugin. Added UserDeleteRelated event for plugins to add related tables to delete from at user delete time. --- plugins/OpenID/OpenIDPlugin.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugins') diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 2309eea9d..e4aed2ddb 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -298,4 +298,10 @@ class OpenIDPlugin extends Plugin new ColumnDef('modified', 'timestamp'))); return true; } + + function onUserDeleteRelated($user, &$tables) + { + $tables[] = 'User_openid'; + return true; + } } -- cgit v1.2.3-54-g00ecf From 1b902bcc45e7b0adfc57a995a8d885e76ce2d44b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:05:07 +0000 Subject: Fixed alignment for entity action anchors and responses --- plugins/UserFlag/UserFlagPlugin.php | 2 +- theme/base/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index fbe5fd351..6910ff332 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -102,7 +102,7 @@ class UserFlagPlugin extends Plugin $action->elementStart('li', 'entity_flag'); if (User_flag_profile::exists($profile->id, $user->id)) { - $action->element('span', array(), + $action->element('p', array(), _('Flagged for review')); } else { $form = new FlagProfileForm($action, $profile, diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 220f2f03a..7cc944082 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -673,7 +673,7 @@ padding-left:23px; .entity_actions a, .entity_actions p { -padding:4px 4px 4px 26px; +padding:4px 4px 1px 26px; } .entity_remote_subscribe { -- cgit v1.2.3-54-g00ecf From cb1013fa59d2109afe6e9a3b9fd16d44cd2726eb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:31:53 +0000 Subject: Fixed Flagged for review view --- plugins/UserFlag/UserFlagPlugin.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'plugins') diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 6910ff332..2376bb859 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -130,4 +130,15 @@ class UserFlagPlugin extends Plugin return true; } + + function onEndShowStatusNetStyles($action) + { + $action->elementStart('style', array('type' => 'text/css')); + $action->raw('.entity_flag input, .entity_flag p {'. + ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'. + ' }'); + $action->elementEnd('style'); + + return true; + } } -- cgit v1.2.3-54-g00ecf