Event is created in the wrong space if the calendar is located in a non-terminal document

How to reproduce:

1. From the calendar app's homepage, create a new calendar using the title "A" and do not check the "terminal" box in the create page form
2. Go back to the calendar app's homepage, create a new calendar using the title "B", select the location "MoccaCalendar.A" (under the previously created calendar) and do not check the "terminal" box in the create page form
3. Create a new even in the B calendar, using the title "X"
4. Click in the calendar on the newly created event, then click "View" in the popup to reach the event's page
5. Observe in the URL (and in the breadcrumbs) that the space is wrong: /xwiki/bin/view/MoccaCalendar.A.B/X?calendarDoc=MoccaCalendar.A.B.WebHome instead of the expected /xwiki/bin/view/MoccaCalendar/A/B/X?calendarDoc=MoccaCalendar.A.B.WebHome
6. Using the breadcrumbs to navigate to the parent (B) calendar takes you to a page not found error (URL: /xwiki/bin/view/MoccaCalendar.A.B/)