Skip to content

Commit

Permalink
Merge pull request #446 from dshafik/fix-cli-prefix
Browse files Browse the repository at this point in the history 
Allow for namespace prefixes in CLI commands
  • Loading branch information
@nateabele
nateabele committed May 2, 2012
2 parents 3cecf8a + 2920acb commit 5c1a903
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/Libraries.php
View file
Expand Up @@ -843,7 +843,7 @@ protected static function _locateDeferred($defer, $paths, $params, array $option
}

foreach (static::_searchPaths($paths, $library, $params) as $tpl) {
$params['library'] = $library;
$params['library'] = rtrim($config['prefix'], '\\');
$class = str_replace('\\*', '', String::insert($tpl, $params));

if (file_exists($file = Libraries::path($class, $options))) {
Expand Down Expand Up @@ -1055,4 +1055,4 @@ protected static function _params($type, $name = "*") {
}
}

?>
?>

2 comments on commit 5c1a903

@greut
Copy link
Contributor

@greut greut commented on 5c1a903 May 2, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's breaking indentation and line ending, no?

lithium/core/Libraries.php

Line 845 in 5c1a903

foreach (static::_searchPaths($paths, $library, $params) as $tpl) {

@nateabele
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh you're right, I didn't notice that. We'll get it on the next QA cleanup. :-)

Please sign in to comment.