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:
f425eeb
)
Fix undefined index
author
Coleman Watts
<coleman@civicrm.org>
Wed, 27 Jan 2016 21:25:07 +0000
(16:25 -0500)
committer
Coleman Watts
<coleman@civicrm.org>
Wed, 27 Jan 2016 21:25:07 +0000
(16:25 -0500)
CRM/Core/Config.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/Config.php
b/CRM/Core/Config.php
index a0b34fad49a0be10feec7e0d759509beb7c23b8e..1c0844d3068702db1e1e5a14225959c144da7ef8 100644
(file)
--- a/
CRM/Core/Config.php
+++ b/
CRM/Core/Config.php
@@
-417,7
+417,10
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
&& !empty($_SERVER['HTTP_REFERER'])
) {
$ref = parse_url($_SERVER['HTTP_REFERER']);
- if (preg_match('/civicrm\/upgrade/', $ref['path']) || preg_match('/civicrm\/upgrade/', urldecode($ref['query']))) {
+ if (
+ (!empty($ref['path']) && preg_match('/civicrm\/upgrade/', $ref['path'])) ||
+ (!empty($ref['query']) && preg_match('/civicrm\/upgrade/', urldecode($ref['query'])))
+ ) {
return TRUE;
}
}