cakephp/cakephp — pull request #638 by jellehenkens (2012-05-07 21:02:51+00:00)
Title: Router::queryString() order inconsistency and bug with appending to a string instead of array

This pull request fixes two issues.

### Missing seperator with string based querystring ###

```php
$result = Router::queryString('foo=bar', array('php' => 'nut');
```

Result:
```
?foo=barphp=nut
```

Expected:
```
?foo=bar&php=nut
```

### Order inconsistency ###

* If $q is a string, the values from $extra are added on the end of the existing $q.
* If $q is an array, the values are added in front of the existing $q.

Modified the order so the values from $extra are always added on the end of the querystring.