summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-10-13 00:00:49 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-10-13 00:00:49 -0400
commite719d5cfe23d9b319bdb064f15dcd53eb6fc2070 (patch)
treeb918cb81f92e814b42c92838a167c11f16581120
parent21598ba65ef45a088204278f96ee61d443f0bb17 (diff)
downloadbrdo-e719d5cfe23d9b319bdb064f15dcd53eb6fc2070.tar.gz
brdo-e719d5cfe23d9b319bdb064f15dcd53eb6fc2070.tar.bz2
Issue #1576552 by jhedstrom, jcisio, markie: Prevent PHP notices in path_node_insert/update if $node->path is defined but $node->path['alias'] is not
-rw-r--r--modules/path/path.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/path/path.module b/modules/path/path.module
index 81c7bb2c5..4614b0fa2 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -185,7 +185,7 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
* Implements hook_node_insert().
*/
function path_node_insert($node) {
- if (isset($node->path)) {
+ if (isset($node->path) && isset($node->path['alias'])) {
$path = $node->path;
$path['alias'] = trim($path['alias']);
// Only save a non-empty alias.
@@ -205,9 +205,9 @@ function path_node_insert($node) {
function path_node_update($node) {
if (isset($node->path)) {
$path = $node->path;
- $path['alias'] = trim($path['alias']);
+ $path['alias'] = isset($path['alias']) ? trim($path['alias']) : '';
// Delete old alias if user erased it.
- if (!empty($path['pid']) && empty($path['alias'])) {
+ if (!empty($path['pid']) && !$path['alias']) {
path_delete($path['pid']);
}
path_node_insert($node);