Author: sevein
Date: Tue Sep  6 10:28:38 2011
New Revision: 9663

Log:
Cosmetic change, call clearCache task twice is not really needed unless you are 
using cli

Modified:
   trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php
   
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/clearCacheAction.class.php

Modified: trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php
==============================================================================
--- trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php       Tue Sep  6 
10:11:57 2011        (r9662)
+++ trunk/plugins/sfInstallPlugin/lib/sfInstall.class.php       Tue Sep  6 
10:28:38 2011        (r9663)
@@ -447,9 +447,6 @@
       $settingsYml['notWritable'] = 'notWritable';
     }
 
-    $dispatcher = sfContext::getInstance()->getEventDispatcher();
-    $formatter = new sfAnsiColorFormatter;
-
     chdir(sfConfig::get('sf_root_dir'));
 
     // TODO By instantiating a new application configuration the cache clear
@@ -460,7 +457,7 @@
 
     // TODO We do not want to cache anything during install, but currently we
     // must clear the cache after adding enabling sfInstallPlugin : (
-    $cacheClear = new sfCacheClearTask($dispatcher, $formatter);
+    $cacheClear = new 
sfCacheClearTask(sfContext::getInstance()->getEventDispatcher(), new 
sfFormatter());
     $cacheClear->run();
 
     sfConfig::set('sf_debug', $saveDebug);

Modified: 
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/clearCacheAction.class.php
==============================================================================
--- 
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/clearCacheAction.class.php
    Tue Sep  6 10:11:57 2011        (r9662)
+++ 
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/actions/clearCacheAction.class.php
    Tue Sep  6 10:28:38 2011        (r9663)
@@ -22,13 +22,8 @@
   public function execute($request)
   {
     // Use existing symfony task
-    $task = new 
sfCacheClearTask(sfContext::getInstance()->getEventDispatcher(), new 
sfFormatter());
-
-    $arguments = $options = array();
-
-    // Clear cache twice (see issue 1188)
-    $task->run($arguments, $options);
-    $task->run($arguments, $options);
+    $cacheClear = new 
sfCacheClearTask(sfContext::getInstance()->getEventDispatcher(), new 
sfFormatter());
+    $cacheClear->run();
 
     $this->redirect(array('module' => 'sfInstallPlugin', 'action' => 
'finishInstall'));
   }

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to