Development

Changeset 13400

You must first sign up to be able to contribute.

Changeset 13400

Show
Ignore:
Timestamp:
11/27/08 12:13:14 (7 months ago)
Author:
fabien
Message:

[1.1] fixed i&8n dirs in config

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/config/sfApplicationConfiguration.class.php

    r13383 r13400  
    415415 
    416416    // plugins 
    417     $pluginDirs = glob(sfConfig::get('sf_plugins_dir').'/*/i18n'); 
    418     if (isset($pluginDirs[0])) 
    419     { 
    420       $dirs[] = $pluginDirs[0]; 
     417    if ($pluginDirs = glob(sfConfig::get('sf_plugins_dir').'/*/i18n')) 
     418    { 
     419      $dirs = array_merge($dirs, $pluginDirs); 
    421420    } 
    422421 
    …… 
    447446    } 
    448447 
    449     // plugins, module in plugins 
    450     return array_merge( 
    451       $dirs, 
    452       (array) glob(sfConfig::get('sf_plugins_dir').'/*/modules/'.$moduleName.'/i18n'), 
    453       (array) glob(sfConfig::get('sf_plugins_dir').'/*/i18n') 
    454     ); 
     448    // modules in plugins 
     449    if ($pluginDirs = glob(sfConfig::get('sf_plugins_dir').'/*/modules/'.$moduleName.'/i18n')) 
     450    { 
     451      $dirs = array_merge($dirs, $pluginDirs); 
     452    } 
     453 
     454    // plugins 
     455    if ($pluginDirs = glob(sfConfig::get('sf_plugins_dir').'/*/i18n')) 
     456    { 
     457      $dirs = array_merge($dirs, $pluginDirs); 
     458    } 
     459 
     460    return $dirs; 
    455461  } 
    456462 

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.

Open-Source Software

Services

> More