[Phpfreechat-svn] SF.net SVN: phpfreechat: [583] trunk/src

[<ke...@us...>]

Revision: 583
Author:   kerphi
Date:     2006-06-15 04:50:12 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=583&view=rev

Log Message:
-----------
Bug fix: the /rehash command was not correctly fixed because the themepath was altered into the pfcglobalconfig init step.

Modified Paths:
--------------
    trunk/src/commands/rehash.class.php
    trunk/src/pfcglobalconfig.class.php
Modified: trunk/src/commands/rehash.class.php
===================================================================
--- trunk/src/commands/rehash.class.php	2006-06-15 10:09:09 UTC (rev 582)
+++ trunk/src/commands/rehash.class.php	2006-06-15 11:50:12 UTC (rev 583)
@@ -14,7 +14,7 @@
   function run(&$xml_reponse, $clientid, $param, $sender, $recipient, $recipientid)
   {
     $c =& $this->c;
-    $destroyed = $c->destroy();
+    $destroyed = $c->destroyCache();    
     $synchro   = $c->synchronizeWithCache();
 
     if ($destroyed && $synchro)

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-06-15 10:09:09 UTC (rev 582)
+++ trunk/src/pfcglobalconfig.class.php	2006-06-15 11:50:12 UTC (rev 583)
@@ -263,9 +263,6 @@
     // copy the themes into the public directory
     $this->errors = array_merge($this->errors, @install_dir($this->themepath_default, $this->data_public_path."/themes"));
     $this->errors = array_merge($this->errors, @install_dir($this->themepath,         $this->data_public_path."/themes"));
-    // now it's copied, so update the themepath parameters to the new location
-    $this->themepath_default = $this->data_public_path."/themes";
-    $this->themepath         = $this->data_public_path."/themes";
     // calculate the corresponding theme url
     if ($this->themeurl_default == "")
       $this->themeurl_default = relativePath($this->client_script_path, $this->data_public_path."/themes");
@@ -377,7 +374,7 @@
     return $this->data_private_path."/cache/pfcglobalconfig_".$this->getId();
   }
   
-  function destroy()
+  function destroyCache()
   {
     $cachefile = $this->_getCacheFile();
     if (!file_exists($cachefile))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.