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.

Merges [25921] to the 3.7 branch.

props LucP.
fixes #25700.


git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25922 602fd350-edb4-49c9-b593-d223f7449a82
3.7 regression from [25119]: Have in_category() return false when the first argument is empty.

Merges [25923] to the 3.7 branch.

props ericlewis.
fixes #25706.


git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25924 602fd350-edb4-49c9-b593-d223f7449a82
In update_option(), call the update_option hook before the DB update.

Merges [25925] to the 3.7 branch.

Reverses a regression from [25664].

props calin.
fixes #25705.


git-svn-id: https://develop.svn.wordpress.org/branches/3.7@25926 602fd350-edb4-49c9-b593-d223f7449a82