From c961b56809d7621015aaa7b812e3b135b6e9adf0 Mon Sep 17 00:00:00 2001 From: Eric Hough Date: Mon, 12 Aug 2013 21:32:57 -0400 Subject: [PATCH] Allowing hyphens in YouTube user/channel names --- .../addons/youtube/impl/options/YouTubeOptionsProvider.php | 2 +- .../addons/youtube/impl/options/YouTubeOptionsProviderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProvider.php b/src/main/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProvider.php index 724425818..5b8adb134 100644 --- a/src/main/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProvider.php +++ b/src/main/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProvider.php @@ -236,7 +236,7 @@ public function getOptionDescriptors() $option = new tubepress_spi_options_OptionDescriptor(tubepress_addons_youtube_api_const_options_names_GallerySource::YOUTUBE_USER_VALUE); $option->setDefaultValue('3hough'); $option->setLabel('Videos from this YouTube user'); //>(translatable)< - $option->setValidValueRegex($_regexWordChars); + $option->setValidValueRegex('/[\w-]+/'); $toReturn[] = $option; diff --git a/src/test/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProviderTest.php b/src/test/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProviderTest.php index 3373a5aea..37e3cd503 100644 --- a/src/test/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProviderTest.php +++ b/src/test/php/add-ons/youtube/classes/tubepress/addons/youtube/impl/options/YouTubeOptionsProviderTest.php @@ -151,7 +151,7 @@ protected function getExpectedOptions() $option = new tubepress_spi_options_OptionDescriptor(tubepress_addons_youtube_api_const_options_names_GallerySource::YOUTUBE_USER_VALUE); $option->setDefaultValue('3hough'); $option->setLabel('Videos from this YouTube user'); //>(translatable)< - $option->setValidValueRegex(self::$_regexWordChars); + $option->setValidValueRegex('/[\w-]+/'); $toReturn[] = $option; $option = new tubepress_spi_options_OptionDescriptor(tubepress_addons_youtube_api_const_options_names_GallerySource::YOUTUBE_FAVORITES_VALUE);