[xoops-svn] SF.net SVN: xoops:[9195] XoopsCore/branches/2.5.x/2.5.5

[<be...@us...>]

Revision: 9195
          http://xoops.svn.sourceforge.net/xoops/?rev=9195&view=rev
Author:   beckmi
Date:     2012-03-26 04:15:26 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
3511205 Bug in fresh install in page_configsave.php (XavierS)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.5/htdocs/install/page_configsave.php

Modified: XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt	2012-03-26 04:08:43 UTC (rev 9194)
+++ XoopsCore/branches/2.5.x/2.5.5/docs/changelog.250.txt	2012-03-26 04:15:26 UTC (rev 9195)
@@ -11,6 +11,7 @@
  - ID: 3494893 PM Messages deleted from Saved box (Danielw42/mage)
  - ID: 3501897 Protector errors (cesag/XavierS)
  - ID: 3511204 TinyEditor only loading in the 'Scoop' part of the News module (peekay/XavierS)
+ - ID: 3511205 Bug in fresh install in page_configsave.php (XavierS)
 
 Improved: 
  - replacing "msnbot" with "bingbot" in Protector (mamba)

Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/install/page_configsave.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/install/page_configsave.php	2012-03-26 04:08:43 UTC (rev 9194)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/install/page_configsave.php	2012-03-26 04:15:26 UTC (rev 9195)
@@ -83,11 +83,20 @@
     }
 }
 
-if (!@copy($rewrite['VAR_PATH'] . '/data/secure.dist.php', $rewrite['VAR_PATH'] . '/data/secure.php')) {
-    $error = ERR_COPY_MAINFILE.$rewrite['VAR_PATH'] . '/data/secure.dist.php';
-} else {
-    clearstatcache();
+//if (!@copy($rewrite['VAR_PATH'] . '/data/secure.dist.php', $rewrite['VAR_PATH'] . '/data/secure.php')) {
+//    $error = ERR_COPY_MAINFILE.$rewrite['VAR_PATH'] . '/data/secure.dist.php';
+//} else {
+//    clearstatcache();
 
+//from XavierS:
+if (!@copy($vars['VAR_PATH'] . '/data/secure.dist.php', $vars['VAR_PATH'] . '/data/secure.php')) {
+   $error = ERR_COPY_MAINFILE.$vars['VAR_PATH'] . '/data/secure.dist.php';
+   } else {
+   clearstatcache();
+
+
+   $rewrite = array_merge($rewrite, $vars);
+
     $rewrite = array_merge($rewrite, $vars);
     if (!$file = fopen($rewrite['VAR_PATH'] . '/data/secure.php', "r")) {
         $error = ERR_READ_MAINFILE;

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