From 9c853232e8956bc445ab729c6a1b43189eea7a9a Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Mon, 11 Sep 2017 09:11:48 +0200 Subject: [PATCH 1/7] BUG: Sample Data blog various issues --- plugins/sampledata/blog/blog.php | 33 +++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index 2036e925e00ed..ff438eb13c82c 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -123,7 +123,7 @@ public function onAjaxSampledataApplyStep1() 'created_user_id' => $user->id, 'extension' => 'com_content', 'level' => 1, - 'alias' => JApplicationHelper::stringURLSafe($categoryTitle), + 'alias' => 'sample-blog' . $langSuffix, 'associations' => array(), 'description' => '', 'language' => $language, @@ -160,7 +160,7 @@ public function onAjaxSampledataApplyStep1() 'created_user_id' => $user->id, 'extension' => 'com_content', 'level' => 1, - 'alias' => JApplicationHelper::stringURLSafe($categoryTitle), + 'alias' => 'sample-help' . $langSuffix, 'associations' => array(), 'description' => '', 'language' => $language, @@ -226,7 +226,7 @@ public function onAjaxSampledataApplyStep1() // Set values which are always the same. $article['id'] = 0; $article['created_user_id'] = $user->id; - $article['alias'] = JApplicationHelper::stringURLSafe($article['title']); + $article['alias'] = $i . 'sample' . JApplicationHelper::stringURLSafe($article['title']); $article['language'] = $language; $article['associations'] = array(); $article['state'] = 1; @@ -304,8 +304,10 @@ public function onAjaxSampledataApplyStep2() 'description' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_DESCRIPTION'), ); - // Calculate menutype. - $menu['menutype'] = JApplicationHelper::stringURLSafe($menu['title']); + // Calculate menutype. The number of characters allowed is 24. + $type = JHtmlString::truncate($menu['title'], 23, true, false); + + $menu['menutype'] = $i . $type; $menuTable->load(); $menuTable->bind($menu); @@ -349,6 +351,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'), 'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[0], 'component_id' => 22, + 'alias' => 'blog' . $langSuffix, 'params' => array( 'layout_type' => 'blog', 'show_category_title' => 0, @@ -376,6 +379,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[0], 'component_id' => 22, + 'alias' => 'about' . $langSuffix, 'params' => array( 'info_block_position' => 0, 'show_category' => 0, @@ -394,6 +398,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, + 'alias' => 'login' . $langSuffix, 'params' => array( 'logindescription_show' => 1, 'logoutdescription_show' => 1, @@ -407,10 +412,11 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'), 'link' => 'index.php?option=com_content&view=form&layout=edit', 'component_id' => 22, + 'alias' => 'post' . $langSuffix, 'access' => 3, 'params' => array( 'enable_category' => 1, - 'catid' => 9, + 'catid' => $catids[0], 'menu_text' => 1, 'show_page_heading' => 0, 'secure' => 0, @@ -421,6 +427,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[1], 'component_id' => 22, + 'alias' => 'working' . $langSuffix, 'params' => array( 'menu_text' => 1, 'show_page_heading' => 0, @@ -433,6 +440,7 @@ public function onAjaxSampledataApplyStep2() 'link' => 'administrator', 'type' => 'url', 'component_id' => 0, + 'alias' => 'siteadmin' . $langSuffix, 'browserNav' => 1, 'access' => 3, 'params' => array( @@ -444,6 +452,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE'), 'link' => 'index.php?option=com_users&view=profile&layout=edit', 'component_id' => 25, + 'alias' => 'changepassword' . $langSuffix, 'access' => 2, 'params' => array( 'menu_text' => 1, @@ -456,6 +465,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, + 'alias' => 'logout' . $langSuffix, 'params' => array( 'logindescription_show' => 1, 'logoutdescription_show' => 1, @@ -486,6 +496,7 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, + 'alias' => 'authorlogin' . $langSuffix, 'params' => array( 'login_redirect_url' => 'index.php?Itemid=' . $menuIdsLevel1[0], 'logindescription_show' => 1, @@ -518,6 +529,7 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_config&view=config&controller=config.display.config', 'parent_id' => $menuIdsLevel1[4], 'component_id' => 23, + 'alias' => 'sitesettings' . $langSuffix, 'access' => 6, 'params' => array( 'menu_text' => 1, @@ -531,6 +543,7 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_config&view=templates&controller=config.display.templates', 'parent_id' => $menuIdsLevel1[4], 'component_id' => 23, + 'alias' => 'templatesettings' . $langSuffix, 'params' => array( 'menu_text' => 1, 'show_page_heading' => 0, @@ -595,6 +608,8 @@ public function onAjaxSampledataApplyStep3() // Get previously entered Data from UserStates $menuTypes = $this->app->getUserState('sampledata.blog.menutypes'); + $catids = $this->app->getUserState('sampledata.blog.articles.catids'); + $modules = array( array( 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE'), @@ -674,7 +689,7 @@ public function onAjaxSampledataApplyStep3() 'position' => 'position-7', 'module' => 'mod_articles_popular', 'params' => array( - 'catid' => ['9'], + 'catid' => $catids[0], 'count' => 5, 'show_front' => 1, 'layout' => '_:default', @@ -694,7 +709,7 @@ public function onAjaxSampledataApplyStep3() 'show_front' => 'show', 'count' => 6, 'category_filtering_type' => 1, - 'catid' => ['9'], + 'catid' => $catids[0], 'show_child_category_articles' => 0, 'levels' => 1, 'author_filtering_type' => 1, @@ -954,7 +969,7 @@ private function addMenuItems(array $menuItems, $level) // Set values which are always the same. $menuItem['id'] = 0; $menuItem['created_user_id'] = $user->id; - $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']); + $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['alias']); $menuItem['published'] = 1; $menuItem['language'] = $language; $menuItem['note'] = ''; From 609f4c273435817987c7e4202b0e1a55f8071b94 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Mon, 11 Sep 2017 16:03:03 +0200 Subject: [PATCH 2/7] Correcting truncate code --- plugins/sampledata/blog/blog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index ff438eb13c82c..7dd1a3eb9329c 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -305,7 +305,7 @@ public function onAjaxSampledataApplyStep2() ); // Calculate menutype. The number of characters allowed is 24. - $type = JHtmlString::truncate($menu['title'], 23, true, false); + $type = JHtml::_('string.truncate', $menu['title'], 23, true, false); $menu['menutype'] = $i . $type; From 88daa64b8429fc11673892be24e8f4ed29640f7d Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Mon, 11 Sep 2017 16:20:51 +0200 Subject: [PATCH 3/7] Simplifying articles aliases creation --- plugins/sampledata/blog/blog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index 7dd1a3eb9329c..e76a443dead6b 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -226,7 +226,7 @@ public function onAjaxSampledataApplyStep1() // Set values which are always the same. $article['id'] = 0; $article['created_user_id'] = $user->id; - $article['alias'] = $i . 'sample' . JApplicationHelper::stringURLSafe($article['title']); + $article['alias'] = JApplicationHelper::stringURLSafe($article['title'] . '-' . $i); $article['language'] = $language; $article['associations'] = array(); $article['state'] = 1; From ba47e90c04ae3562970411c9e81a7691b6b0d7df Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Tue, 12 Sep 2017 12:38:06 +0200 Subject: [PATCH 4/7] Using unicode aliases when language is not using latin glyphs --- plugins/sampledata/blog/blog.php | 73 +++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index e76a443dead6b..d87cb6fafbc00 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -113,9 +113,18 @@ public function onAjaxSampledataApplyStep1() // Create "blog" category. $categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel'); $catIds = array(); - $categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE') . $langSuffix; + $categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE'); + $alias = JApplicationHelper::stringURLSafe($categoryTitle); + + // Set unicodeslugs if alias is empty + if (trim(str_replace('-', '', $alias) == '')) + { + JFactory::getConfig()->set('unicodeslugs', 1); + $alias = JApplicationHelper::stringURLSafe($categoryTitle); + } + $category = array( - 'title' => $categoryTitle, + 'title' => $categoryTitle . $langSuffix, 'parent_id' => 1, 'id' => 0, 'published' => 1, @@ -123,7 +132,7 @@ public function onAjaxSampledataApplyStep1() 'created_user_id' => $user->id, 'extension' => 'com_content', 'level' => 1, - 'alias' => 'sample-blog' . $langSuffix, + 'alias' => $alias . $langSuffix, 'associations' => array(), 'description' => '', 'language' => $language, @@ -150,9 +159,18 @@ public function onAjaxSampledataApplyStep1() $catIds[] = $categoryModel->getItem()->id; // Create "help" category. - $categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE') . $langSuffix; + $categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE'); + $alias = JApplicationHelper::stringURLSafe($categoryTitle); + + // Set unicodeslugs if alias is empty + if (trim(str_replace('-', '', $alias) == '')) + { + JFactory::getConfig()->set('unicodeslugs', 1); + $alias = JApplicationHelper::stringURLSafe($categoryTitle); + } + $category = array( - 'title' => $categoryTitle, + 'title' => $categoryTitle . $langSuffix, 'parent_id' => 1, 'id' => 0, 'published' => 1, @@ -160,7 +178,7 @@ public function onAjaxSampledataApplyStep1() 'created_user_id' => $user->id, 'extension' => 'com_content', 'level' => 1, - 'alias' => 'sample-help' . $langSuffix, + 'alias' => $alias . $langSuffix, 'associations' => array(), 'description' => '', 'language' => $language, @@ -219,14 +237,24 @@ public function onAjaxSampledataApplyStep1() foreach ($articles as $i => $article) { // Set values from language strings. - $article['title'] = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_TITLE') . $langSuffix; + $title = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_TITLE'); + $alias = JApplicationHelper::stringURLSafe($title); + $article['title'] = $title . $langSuffix; $article['introtext'] = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_INTROTEXT'); $article['fulltext'] = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_FULLTEXT'); // Set values which are always the same. $article['id'] = 0; $article['created_user_id'] = $user->id; - $article['alias'] = JApplicationHelper::stringURLSafe($article['title'] . '-' . $i); + $article['alias'] = JApplicationHelper::stringURLSafe($article['title']); + + // Set unicodeslugs if alias is empty + if (trim(str_replace('-', '', $alias) == '')) + { + JFactory::getConfig()->set('unicodeslugs', 1); + $article['alias'] = JApplicationHelper::stringURLSafe($article['title']); + } + $article['language'] = $language; $article['associations'] = array(); $article['state'] = 1; @@ -305,7 +333,7 @@ public function onAjaxSampledataApplyStep2() ); // Calculate menutype. The number of characters allowed is 24. - $type = JHtml::_('string.truncate', $menu['title'], 23, true, false); + $type = JHtmlString::truncate($menu['title'], 23, true, false); $menu['menutype'] = $i . $type; @@ -351,7 +379,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'), 'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[0], 'component_id' => 22, - 'alias' => 'blog' . $langSuffix, 'params' => array( 'layout_type' => 'blog', 'show_category_title' => 0, @@ -379,7 +406,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[0], 'component_id' => 22, - 'alias' => 'about' . $langSuffix, 'params' => array( 'info_block_position' => 0, 'show_category' => 0, @@ -398,7 +424,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, - 'alias' => 'login' . $langSuffix, 'params' => array( 'logindescription_show' => 1, 'logoutdescription_show' => 1, @@ -412,7 +437,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'), 'link' => 'index.php?option=com_content&view=form&layout=edit', 'component_id' => 22, - 'alias' => 'post' . $langSuffix, 'access' => 3, 'params' => array( 'enable_category' => 1, @@ -427,7 +451,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE'), 'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[1], 'component_id' => 22, - 'alias' => 'working' . $langSuffix, 'params' => array( 'menu_text' => 1, 'show_page_heading' => 0, @@ -440,7 +463,6 @@ public function onAjaxSampledataApplyStep2() 'link' => 'administrator', 'type' => 'url', 'component_id' => 0, - 'alias' => 'siteadmin' . $langSuffix, 'browserNav' => 1, 'access' => 3, 'params' => array( @@ -452,7 +474,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE'), 'link' => 'index.php?option=com_users&view=profile&layout=edit', 'component_id' => 25, - 'alias' => 'changepassword' . $langSuffix, 'access' => 2, 'params' => array( 'menu_text' => 1, @@ -465,7 +486,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, - 'alias' => 'logout' . $langSuffix, 'params' => array( 'logindescription_show' => 1, 'logoutdescription_show' => 1, @@ -496,7 +516,6 @@ public function onAjaxSampledataApplyStep2() 'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE'), 'link' => 'index.php?option=com_users&view=login', 'component_id' => 25, - 'alias' => 'authorlogin' . $langSuffix, 'params' => array( 'login_redirect_url' => 'index.php?Itemid=' . $menuIdsLevel1[0], 'logindescription_show' => 1, @@ -529,7 +548,6 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_config&view=config&controller=config.display.config', 'parent_id' => $menuIdsLevel1[4], 'component_id' => 23, - 'alias' => 'sitesettings' . $langSuffix, 'access' => 6, 'params' => array( 'menu_text' => 1, @@ -543,7 +561,6 @@ public function onAjaxSampledataApplyStep2() 'link' => 'index.php?option=com_config&view=templates&controller=config.display.templates', 'parent_id' => $menuIdsLevel1[4], 'component_id' => 23, - 'alias' => 'templatesettings' . $langSuffix, 'params' => array( 'menu_text' => 1, 'show_page_heading' => 0, @@ -963,13 +980,21 @@ private function addMenuItems(array $menuItems, $level) // Reset item.id in model state. $this->menuItemModel->setState('item.id', 0); - // Append language suffix to title. - $menuItem['title'] .= $langSuffix; - // Set values which are always the same. $menuItem['id'] = 0; $menuItem['created_user_id'] = $user->id; - $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['alias']); + $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']); + + // Set unicodeslugs if alias is empty + if (trim(str_replace('-', '', $menuItem['alias']) == '')) + { + JFactory::getConfig()->set('unicodeslugs', 1); + $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']); + } + + // Append language suffix to title. + $menuItem['title'] .= $langSuffix; + $menuItem['published'] = 1; $menuItem['language'] = $language; $menuItem['note'] = ''; From cca4fefdf0b542b6a37bb9a0461d614e46b87583 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Tue, 12 Sep 2017 13:01:39 +0200 Subject: [PATCH 5/7] correct truncate (again) --- plugins/sampledata/blog/blog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index d87cb6fafbc00..0907a2a6c48e2 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -333,7 +333,7 @@ public function onAjaxSampledataApplyStep2() ); // Calculate menutype. The number of characters allowed is 24. - $type = JHtmlString::truncate($menu['title'], 23, true, false); + $type = JHtml::_('string.truncate', $menu['title'], 23, true, false); $menu['menutype'] = $i . $type; From b26b55b5d3ca2e17943442ab9967f45bf05a82bd Mon Sep 17 00:00:00 2001 From: infograf768 Date: Thu, 14 Sep 2017 17:56:26 +0200 Subject: [PATCH 6/7] Makung sure unicodeslugs is reverted to the configuration settings --- plugins/sampledata/blog/blog.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index 0907a2a6c48e2..3a7cfb6b3c712 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -82,6 +82,8 @@ public function onSampledataGetOverview() */ public function onAjaxSampledataApplyStep1() { + $unicode = JFactory::getConfig()->get('unicodeslugs', 1); + if ($this->app->input->get('type') != $this->_name) { return; @@ -290,6 +292,8 @@ public function onAjaxSampledataApplyStep1() $response->success = true; $response->message = JText::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS'); + JFactory::getConfig()->set('unicodeslugs', $unicode); + return $response; } @@ -967,6 +971,8 @@ public function onAjaxSampledataApplyStep3() */ private function addMenuItems(array $menuItems, $level) { + $unicode = JFactory::getConfig()->get('unicodeslugs', 1); + $itemIds = array(); $access = (int) $this->app->get('access', 1); $user = JFactory::getUser(); @@ -1054,6 +1060,8 @@ private function addMenuItems(array $menuItems, $level) $itemIds[] = $this->menuItemModel->getstate('item.id'); } + JFactory::getConfig()->set('unicodeslugs', $unicode); + return $itemIds; } } From be9978df42af0f72b4041bcdae29a8602f79e170 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Fri, 15 Sep 2017 21:45:30 -0500 Subject: [PATCH 7/7] Tweak config reset --- plugins/sampledata/blog/blog.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/plugins/sampledata/blog/blog.php b/plugins/sampledata/blog/blog.php index 3a7cfb6b3c712..ab39d7198fe0d 100644 --- a/plugins/sampledata/blog/blog.php +++ b/plugins/sampledata/blog/blog.php @@ -82,8 +82,6 @@ public function onSampledataGetOverview() */ public function onAjaxSampledataApplyStep1() { - $unicode = JFactory::getConfig()->get('unicodeslugs', 1); - if ($this->app->input->get('type') != $this->_name) { return; @@ -121,8 +119,9 @@ public function onAjaxSampledataApplyStep1() // Set unicodeslugs if alias is empty if (trim(str_replace('-', '', $alias) == '')) { - JFactory::getConfig()->set('unicodeslugs', 1); + $unicode = JFactory::getConfig()->set('unicodeslugs', 1); $alias = JApplicationHelper::stringURLSafe($categoryTitle); + JFactory::getConfig()->set('unicodeslugs', $unicode); } $category = array( @@ -167,8 +166,9 @@ public function onAjaxSampledataApplyStep1() // Set unicodeslugs if alias is empty if (trim(str_replace('-', '', $alias) == '')) { - JFactory::getConfig()->set('unicodeslugs', 1); + $unicode = JFactory::getConfig()->set('unicodeslugs', 1); $alias = JApplicationHelper::stringURLSafe($categoryTitle); + JFactory::getConfig()->set('unicodeslugs', $unicode); } $category = array( @@ -253,8 +253,9 @@ public function onAjaxSampledataApplyStep1() // Set unicodeslugs if alias is empty if (trim(str_replace('-', '', $alias) == '')) { - JFactory::getConfig()->set('unicodeslugs', 1); + $unicode = JFactory::getConfig()->set('unicodeslugs', 1); $article['alias'] = JApplicationHelper::stringURLSafe($article['title']); + JFactory::getConfig()->set('unicodeslugs', $unicode); } $article['language'] = $language; @@ -292,8 +293,6 @@ public function onAjaxSampledataApplyStep1() $response->success = true; $response->message = JText::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS'); - JFactory::getConfig()->set('unicodeslugs', $unicode); - return $response; } @@ -971,8 +970,6 @@ public function onAjaxSampledataApplyStep3() */ private function addMenuItems(array $menuItems, $level) { - $unicode = JFactory::getConfig()->get('unicodeslugs', 1); - $itemIds = array(); $access = (int) $this->app->get('access', 1); $user = JFactory::getUser(); @@ -994,8 +991,9 @@ private function addMenuItems(array $menuItems, $level) // Set unicodeslugs if alias is empty if (trim(str_replace('-', '', $menuItem['alias']) == '')) { - JFactory::getConfig()->set('unicodeslugs', 1); + $unicode = JFactory::getConfig()->set('unicodeslugs', 1); $menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']); + JFactory::getConfig()->set('unicodeslugs', $unicode); } // Append language suffix to title. @@ -1060,8 +1058,6 @@ private function addMenuItems(array $menuItems, $level) $itemIds[] = $this->menuItemModel->getstate('item.id'); } - JFactory::getConfig()->set('unicodeslugs', $unicode); - return $itemIds; } }