Changeset 1916

Show
Ignore:
Timestamp:
04/23/06 07:24:28 (10 months ago)
Author:
demian
Message:

fixed installer session error prob

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/0.6-bugfix/etc/release.sh

    r1915 r1916  
    258258 
    259259    mv Seagull-$RELEASE_NAME.tgz /tmp/$PROJECT_NAME-$RELEASE_NAME 
    260  
    261260} 
    262261 
     
    278277exportSvnAndPackage 
    279278 
    280 #uploadToSfWholePackage 
    281  
    282 #generateApiDocs 
    283  
    284 #packageApiDocs 
    285  
    286 #uploadToSfApiDocs 
     279uploadToSfWholePackage 
     280 
     281generateApiDocs 
     282 
     283packageApiDocs 
     284 
     285uploadToSfApiDocs 
    287286 
    288287#scpApiDocsToSglSite 
  • branches/0.6-bugfix/lib/SGL/DB.php

    r1888 r1916  
    8181            $fatal = (defined('SGL_INSTALLED')) ? PEAR_ERROR_DIE : null; 
    8282            if (DB::isError($conn)) { 
    83                 $err = PEAR::raiseError('Cannot connect to DB, check your credentials, exiting ...', 
     83                $msg = 'Cannot connect to DB, check your credentials, exiting ...'; 
     84                if (is_file(SGL_VAR_DIR . '/INSTALL_COMPLETE.php')) { 
     85                    $msg .= 'If you remove the file seagull/var/INSTALL_COMPLETE.php you will be able to run the setup again.'; 
     86                } 
     87                $err = PEAR::raiseError($msg, 
    8488                    SGL_ERROR_DBFAILURE, $fatal); 
    8589                return $err; 
  • branches/0.6-bugfix/lib/SGL/Install/Common.php

    r1877 r1916  
    5050        if (!isset($GLOBALS['_SGL'])) { 
    5151            $GLOBALS['_SGL'] = array(); 
    52         } 
    53         if (!isset($_SESSION['ERRORS'])) { 
    54             $_SESSION['ERRORS'] = array(); 
    5552        } 
    5653        array_push($_SESSION['ERRORS'], $error); 
  • branches/0.6-bugfix/www/setup.php

    r1903 r1916  
    9090SGL_FrontController::init(); 
    9191session_start(); 
     92$_SESSION['ERRORS'] = array(); 
    9293 
    9394//  reroute to front controller