3.7 regression: Fix the width of captioned images inserted into the visual editor.

Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: https://github.com/mishoo/UglifyJS2/pull/330.

props LucP.
fixes #25700 for trunk.

Built from https://develop.svn.wordpress.org/trunk@25921


git-svn-id: http://core.svn.wordpress.org/trunk@25880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
3.7 regression from [25119]: Have in_category() return false when the first argument is empty.

Adds unit tests.

props ericlewis.
fixes #25706 for trunk.

Built from https://develop.svn.wordpress.org/trunk@25923


git-svn-id: http://core.svn.wordpress.org/trunk@25882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
In update_option(), call the update_option hook before the DB update.

Reverses a regression from [25664].

props calin.
fixes #25705 for trunk.

Built from https://develop.svn.wordpress.org/trunk@25925


git-svn-id: http://core.svn.wordpress.org/trunk@25884 1a063a9b-81f0-0310-95a4-ce76da25c4cd