In paginate_links(), don't override custom format arguments when setting up default 'add_args'.

Since 4.1 [29780], the default value of the 'add_args' argument in
`paginate_links()` has been determined by parsing the current URL. This change
had the side effect of overriding custom values of 'format' that changed the
pagination query var, with the result that plugins using `paginate_links()`
with a custom format generated the incorrect links unless explicitly
declaring 'add_args=false' to prevent the default values from overriding. We
fix this behavior by parsing URL query vars into the 'add_args' array only
after the explicit function params have been parsed, and by skipping the
current page's pagination query var when doing this parsing (to avoid the
override).

Props obenland.
Fixes #30831 for trunk.
Built from https://develop.svn.wordpress.org/trunk@31203


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

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31202';
+$wp_version = '4.2-alpha-31203';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.