Skip to content

Fix espacing #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 4, 2017
Merged

Fix espacing #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c6b858
Fix escaping
dereuromark Sep 4, 2017
9e48e9a
Fix travis
dereuromark Sep 4, 2017
a44711b
Fix travis
dereuromark Sep 4, 2017
a6e9e69
Merge branch 'master' into bugfix-empty
dereuromark Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ php:
env:
matrix:
- DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
- DB=pgsql db_class='Cake\Database\Driver\Postgres' db_dsn='postgres://[email protected]/cakephp_test' db_database='cakephp_test' db_username='travis' db_password=''
- DB=pgsql db_dsn='postgres://[email protected]/cakephp_test'
global:
- DEFAULT=1 CI=1

Expand All @@ -28,7 +28,7 @@ before_script:
- composer self-update
- composer install --prefer-source --no-interaction --dev

- if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
- if [[ $DB = 'mysql' ]]; then mysql -u root -e 'CREATE DATABASE cakephp_test;'; fi
- if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi

- if [[ $PHPCS != 1 ]]; then composer require phpunit/phpunit:"<6.0"; fi
Expand Down
6 changes: 4 additions & 2 deletions src/View/Helper/GoogleMapHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,9 @@ public function staticMap(array $options = [], array $attributes = []) {
$defaultAttributes = ['alt' => __d('tools', 'Map')];
$attributes += $defaultAttributes;

return $this->Html->image($this->staticMapUrl($options), $attributes);
// This was fixed in 3.5.1 to auto-escape URL query strings for security reasons
$escape = version_compare(Configure::version(), '3.5.1') < 0 ? true : false;
return $this->Html->image($this->staticMapUrl($options + ['escape' => $escape]), $attributes);
}

/**
Expand All @@ -1395,7 +1397,7 @@ public function staticMapLink($title, array $mapOptions = [], array $linkOptions
* Creates a URL to a plain image map.
*
* Options:
* - escape: defaults to true
* - escape: defaults to true (Deprecated as of CakePHP 3.5.1 and now has to be always false)
*
* @param array $options
* - see staticMap() for details
Expand Down