Skip to content

Commit c085530

Browse files
author
André R
committed
Merge branch '6.7' into 6.13
2 parents 466ce1e + c4fb66f commit c085530

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,14 @@ script:
8282
- if [ "$BEHAT_OPTS" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/behat $BEHAT_OPTS" ; fi
8383
- if [ "$REST_TEST_CONFIG" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "php -d date.timezone=$TEST_TIMEZONE -d memory_limit=-1 bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" ; fi
8484

85-
# disable mail notifications
8685
notifications:
87-
email: false
86+
slack:
87+
rooms:
88+
- secure: Xb/nKrA5C4E5pNZulEVht1fT4gsOgoQp9WDNWVSBXz8i8JVPUZo20MtKt67pXK2SmxXbgY8aWbHrD1Y3Lv5YLUCHPJQKVxFiDLTh7sACxvHoEa8EuLiQo9naitMSXL1S4PaC8ptaVn9fe2Fwfg+ydSFLCsFDa+qmdBYjNaf8W4M=
89+
- secure: qEgnhpVaWJZQNvJRisv5Kb1vfuZ4H0LjPGWdTk9Q1+MmQMhv/zGV1Z/H1+FEmxlZxk7zrC5ooLs5+K5Nf24XycAM1yczYWGBWJa0P+WKO1KfPx/NbOdSugXIKfbW4JcmwY5mpxPHf+9nUbEOv6zu3cOhWJg41MbTLcGRle+NZVc=
90+
on_success: change
91+
on_failure: always
92+
on_pull_requests: false
8893

8994
# reduce depth (history) of git checkout
9095
git:

eZ/Publish/Core/Persistence/Legacy/Content/UrlAlias/Gateway/DoctrineDatabase.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,13 @@ public function loadPathData($id)
893893
if (empty($rows)) {
894894
// Normally this should never happen
895895
// @todo remove throw when tested
896-
$path = implode('/', $pathData);
896+
$pathDataArray = [];
897+
898+
foreach ($pathData as $path) {
899+
$pathDataArray[] = $path[0]['text'];
900+
}
901+
902+
$path = implode('/', $pathDataArray);
897903
throw new \RuntimeException("Path ({$path}...) is broken, last id is '{$id}': " . __METHOD__);
898904
}
899905

0 commit comments

Comments
 (0)