move cache_reset file to cache/{env}/cache_reset

sourcefabric · Jan 14, 2016 · 6876303 · 6876303
1 parent d52b3b5
commit 6876303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/newscoop/application/modules/admin/Bootstrap.php b/newscoop/application/modules/admin/Bootstrap.php
@@ -53,9 +53,10 @@ protected function _initNewscoop()
             }, error_reporting());
         }
 
-        if (file_exists($Campsite['HTML_DIR'] . '/reset_cache')) {
+        $resetCachePath = Zend_Registry::get('container')->getParameter('kernel.cache_dir').'/reset_cache';
+        if (file_exists($resetCachePath)) {
             CampCache::singleton()->clear('user');
-            unlink($GLOBALS['g_campsiteDir'] . '/reset_cache');
+            unlink($resetCachePath);
         }
     }
 

diff --git a/newscoop/library/Newscoop/Tools/Console/Command/AutopublishCommand.php b/newscoop/library/Newscoop/Tools/Console/Command/AutopublishCommand.php
@@ -8,11 +8,12 @@
 namespace Newscoop\Tools\Console\Command;
 
 use Symfony\Component\Console;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 /**
  * Update Image Storage Command
  */
-class AutopublishCommand extends Console\Command\Command
+class AutopublishCommand extends ContainerAwareCommand
 {
     /**
      * @see Console\Command\Command
@@ -32,9 +33,8 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
     {
         $issueActions = \IssuePublish::DoPendingActions();
         $articleActions = \ArticlePublish::DoPendingActions();
-
         if ($issueActions > 0 || $articleActions > 0) {
-            fopen(realpath(APPLICATION_PATH . '/../') .'/reset_cache', 'w');
+            fopen($this->getContainer()->getParameter('kernel.cache_dir') .'/reset_cache', 'w');
         }
 
         if ($input->getOption('verbose')) {