projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f77dfba
)
Convert to old array syntax for the sake of jenkins
author
Coleman Watts
<coleman@civicrm.org>
Mon, 30 Nov 2015 03:15:35 +0000
(22:15 -0500)
committer
Coleman Watts
<coleman@civicrm.org>
Mon, 30 Nov 2015 03:15:35 +0000
(22:15 -0500)
CRM/Utils/System/Drupal8.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/System/Drupal8.php
b/CRM/Utils/System/Drupal8.php
index 32a5bc4884ee6889dcafc170ee84d5007ccbc880..d626e9cb3dede7ce949a9b317ff7530555072dba 100644
(file)
--- a/
CRM/Utils/System/Drupal8.php
+++ b/
CRM/Utils/System/Drupal8.php
@@
-337,11
+337,11
@@
class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
// Not all links that CiviCRM generates are Drupal routes, so we use the weaker ::fromUri method.
try {
- $url = \Drupal\Core\Url::fromUri("base:{$url['path']}",
[
+ $url = \Drupal\Core\Url::fromUri("base:{$url['path']}",
array(
'query' => $url['query'],
'fragment' => $fragment,
'absolute' => $absolute,
-
]
)->toString();
+
)
)->toString();
}
catch (Exception $e) {
// @Todo: log to watchdog