Development

Changeset 12920

You must first sign up to be able to contribute.

Changeset 12920

Show
Ignore:
Timestamp:
11/10/08 23:01:22 (8 months ago)
Author:
fabien
Message:

[1.2] fixed symfony default CLI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.2/data/bin/symfony

    r8627 r12920  
    1111 
    1212// project exists? 
    13 if (file_exists('config/config.php')) 
     13if (file_exists('config/ProjectConfiguration.class.php')) 
    1414{ 
    15   include('config/config.php'); 
     15  require_once('config/ProjectConfiguration.class.php'); 
     16  $configuration = new ProjectConfiguration(); 
     17 
     18  $dir = $configuration->getSymfonyLibDir(); 
    1619} 
    17  
    18 if (!isset($sf_symfony_lib_dir)) 
     20else 
    1921{ 
    2022  if (is_readable(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php')) 
    2123  { 
    2224    // SVN 
    23     $sf_symfony_lib_dir = realpath(dirname(__FILE__).'/../../lib'); 
     25    $dir = realpath(dirname(__FILE__).'/../../lib'); 
    2426  } 
    2527  else 
    2628  { 
    2729    // PEAR 
    28     $sf_symfony_lib_dir = '@PEAR-DIR@/symfony'; 
     30    $dir = '@PEAR-DIR@/symfony'; 
    2931 
    30     if (!is_dir($sf_symfony_lib_dir)) 
     32    if (!is_dir($dir)) 
    3133    { 
    3234      throw new Exception('Unable to find symfony libraries'); 
     
    3537} 
    3638 
    37 include($sf_symfony_lib_dir.'/command/cli.php'); 
     39include($dir.'/command/cli.php'); 

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting, and supporting several large Open-Source projects.