Skip to content

Commit

Permalink
Shortened the name of the option 'assetTimestamp' to 'timestamp'.
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaLuckers committed Dec 12, 2017
1 parent 98d9917 commit ba47e93
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/View/Helper/UrlHelper.php
Expand Up @@ -71,7 +71,7 @@ public function build($url = null, $options = false)
* `fullBase` Return full URL with domain name
* `pathPrefix` Path prefix for relative URLs
* `plugin` False value will prevent parsing path as a plugin
* `assetTimestamp` Overrides the value of `Asset.timestamp` in Configure.
* `timestamp` Overrides the value of `Asset.timestamp` in Configure.
* Set to false to skip timestamp generation.
* Set to true to apply timestamps when debug is true. Set to 'force' to always
* enable timestamping regardless of debug value.
Expand All @@ -96,7 +96,7 @@ public function image($path, array $options = [])
* `pathPrefix` Path prefix for relative URLs
* `ext` Asset extension to append
* `plugin` False value will prevent parsing path as a plugin
* `assetTimestamp` Overrides the value of `Asset.timestamp` in Configure.
* `timestamp` Overrides the value of `Asset.timestamp` in Configure.
* Set to false to skip timestamp generation.
* Set to true to apply timestamps when debug is true. Set to 'force' to always
* enable timestamping regardless of debug value.
Expand All @@ -122,7 +122,7 @@ public function css($path, array $options = [])
* `pathPrefix` Path prefix for relative URLs
* `ext` Asset extension to append
* `plugin` False value will prevent parsing path as a plugin
* `assetTimestamp` Overrides the value of `Asset.timestamp` in Configure.
* `timestamp` Overrides the value of `Asset.timestamp` in Configure.
* Set to false to skip timestamp generation.
* Set to true to apply timestamps when debug is true. Set to 'force' to always
* enable timestamping regardless of debug value.
Expand All @@ -148,7 +148,7 @@ public function script($path, array $options = [])
* `pathPrefix` Path prefix for relative URLs
* `ext` Asset extension to append
* `plugin` False value will prevent parsing path as a plugin
* `assetTimestamp` Overrides the value of `Asset.timestamp` in Configure.
* `timestamp` Overrides the value of `Asset.timestamp` in Configure.
* Set to false to skip timestamp generation.
* Set to true to apply timestamps when debug is true. Set to 'force' to always
* enable timestamping regardless of debug value.
Expand Down Expand Up @@ -181,11 +181,11 @@ public function assetUrl($path, array $options = [])
$path = Inflector::underscore($plugin) . '/' . $path;
}

$optionAssetTimestamp = null;
if (array_key_exists('assetTimestamp', $options)) {
$optionAssetTimestamp = $options['assetTimestamp'];
$optionTimestamp = null;
if (array_key_exists('timestamp', $options)) {
$optionTimestamp = $options['timestamp'];
}
$webPath = $this->assetTimestamp($this->webroot($path), $optionAssetTimestamp);
$webPath = $this->assetTimestamp($this->webroot($path), $optionTimestamp);

$path = $this->_encodeUrl($webPath);

Expand Down

0 comments on commit ba47e93

Please sign in to comment.