diff --git a/js/src/common/utils/string.js b/js/src/common/utils/string.js index 291e7bc7f..bab89c5e2 100644 --- a/js/src/common/utils/string.js +++ b/js/src/common/utils/string.js @@ -16,6 +16,10 @@ export function truncate(string, length, start = 0) { * Create a slug out of the given string. Non-alphanumeric characters are * converted to hyphens. * + * NOTE: This method does not use the comparably sophisticated transliteration + * mechanism that is employed in the backend. Therefore, it should only be used + * to *suggest* slugs that can be overridden by the user. + * * @param {String} string * @return {String} */ diff --git a/migrations/2016_02_04_095452_add_slug_to_discussions.php b/migrations/2016_02_04_095452_add_slug_to_discussions.php index 21be8cc26..c34fdd17f 100644 --- a/migrations/2016_02_04_095452_add_slug_to_discussions.php +++ b/migrations/2016_02_04_095452_add_slug_to_discussions.php @@ -7,9 +7,9 @@ * LICENSE file that was distributed with this source code. */ -use Flarum\Util\Str; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Builder; +use Illuminate\Support\Str; return [ 'up' => function (Builder $schema) { diff --git a/src/Discussion/Discussion.php b/src/Discussion/Discussion.php index 9db74c4a7..5d2ecb6ed 100644 --- a/src/Discussion/Discussion.php +++ b/src/Discussion/Discussion.php @@ -23,7 +23,7 @@ use Flarum\Notification\Notification; use Flarum\Post\MergeableInterface; use Flarum\Post\Post; use Flarum\User\User; -use Flarum\Util\Str; +use Illuminate\Support\Str; /** * @property int $id diff --git a/src/Util/Str.php b/src/Util/Str.php deleted file mode 100644 index e00a6d70e..000000000 --- a/src/Util/Str.php +++ /dev/null @@ -1,31 +0,0 @@ -