Remove "This Plugin is Disabled" click-through

I try a newbie user perspective...

I just want to see that video. Let's go to that video site. Ok. Hmm. I see...

"The plugin is disabled.* Manage plugins..." Click! Flash... Enable... Doesn't work. Let's try another page. It says... "Click here to activate unknown plugin." Click!

And boom. The user shoot it's own feet.

The option "Tor Button -> Preferences -> Security Settings -> Disable Browser Plugins (such as Flash)" is checked.

I think this is a regression. If that Tor Button setting is set, plugins shouldn't get activated, unless that option gets unchecked.

Version: Tor Browser Bundle (2.3.25-4)