Merge branch 'overcastsoftware-master'

CHANGELOG.txt

@@ -31,7 +31,7 @@ Changelog
  * Fix: `PageManager.sibling_of(page)` and `PageManager.not_sibling_of(page)` now default to inclusive (i.e. `page` is considered a sibling of itself), for consistency with other sibling methods
  * Fix: The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
  * Fix: API endpoints now accept and ignore the `_` query parameter used by jQuery for cache-busting
-
+ * Fix: Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
 
 1.1 (15.09.2015)
 ~~~~~~~~~~~~~~~~

CONTRIBUTORS.rst

@@ -73,6 +73,7 @@ Contributors
 * Ryan Pineo
 * Petr Vacha
 * Josh Barr
+* Sævar Öfjörð Magnússon
 
 
 Translators
@@ -93,7 +94,7 @@ Translators
 * German: Karl Sander, Johannes Spielmann, m0rph3u5, pcraston, Tammo van Lessen
 * Greek: Serafeim Papastefanos, Jim Dal
 * Hebrew (Israel): bjesus, Lior Abazon
-* Icelandic: Arnar Tumi Þorsteinsson, saevarom
+* Icelandic: Arnar Tumi Þorsteinsson, Sævar Öfjörð Magnússon
 * Italian: Andrea Tagliazucchi, Claudio Bantaloukas, Alessio Di Stasio, Giacomo Ghizzani
 * Japanese: Daigo Shitara, Toshikazu Michisu
 * Mongolian: Delgermurun Purevkhuu, miiiga

docs/releases/1.2.rst

@@ -67,7 +67,7 @@ Bug fixes
  * ``PageManager.sibling_of(page)`` and ``PageManager.not_sibling_of(page)`` now default to inclusive (i.e. ``page`` is considered a sibling of itself), for consistency with other sibling methods
  * The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
  * API endpoints now accept and ignore the ``_`` query parameter used by jQuery for cache-busting
-
+ * Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
 
 Upgrade considerations
 ======================

wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js

@@ -296,7 +296,7 @@ function InlinePanel(opts) {
 
 function cleanForSlug(val, useURLify) {
     if (URLify != undefined && useURLify !== false) { // Check to be sure that URLify function exists, and that we want to use it.
-        return URLify(val, val.length);
+        return URLify(val);
     } else { // If not just do the "replace"
         return val.replace(/\s/g, '-').replace(/[^A-Za-z0-9\-\_]/g, '').toLowerCase();
     }