Merge branch 'master' of https://github.com/sourcefabric/Newscoop

sourcefabric · Nov 19, 2014 · 0003849 · 0003849
2 parents 4ce5c25 + 2c4e0f5
commit 0003849
Show file tree

Hide file tree

Showing 23 changed files with 876 additions and 514 deletions.
diff --git a/newscoop/admin-files/articles/do_add.php b/newscoop/admin-files/articles/do_add.php
@@ -144,10 +144,10 @@
  camp_html_add_msg($translator->trans("Article created.", array(), 'articles'), "ok");
 
  $pluginService = \Zend_Registry::get('container')->getService('newscoop.plugins.service');
- if ($pluginService->isEnabled('terwey/plugin-newscoop-articleeditscreen')) {
+ if ($pluginService->isEnabled('newscoop/article-edit-screen')) {
  $router = \Zend_Registry::get('container')->getService('router');
  $language = new Language($articleObj->getLanguageId());
- $articleLink = $router->generate('newscoop_admin_aes').'#/'.$language->getCode().'/'.$articleObj->getArticleNumber();
+ $articleLink = $router->generate('newscoop_admin_aes', array('language' => $language->getCode(), 'articleNumber' => $articleObj->getArticleNumber()));
  } else {
  $articleLink = camp_html_article_url($articleObj, $f_language_id, "edit.php");
  }