import v1.1.0_RC2 | 2009-09-20
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
* @subpackage Framework
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id$
|
||||
* @version $Id: Profile.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -165,12 +165,14 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta
|
||||
require_once 'Zend/Tool/Project/Exception.php';
|
||||
throw new Zend_Tool_Project_Exception('"projectProfileFile" was supplied but file was not found at location ' . $projectProfileFilePath);
|
||||
}
|
||||
$this->_attributes['projectDirectory'] = dirname($projectProfileFilePath);
|
||||
} else {
|
||||
$projectProfileFilePath = rtrim($this->_attributes['projectDirectory'], '/\\') . '/.zfproject.xml';
|
||||
if (!file_exists($projectProfileFilePath)) {
|
||||
require_once 'Zend/Tool/Project/Exception.php';
|
||||
throw new Zend_Tool_Project_Exception('"projectDirectory" was supplied but no profile file file was not found at location ' . $projectProfileFilePath);
|
||||
}
|
||||
$this->_attributes['projectProfileFile'] = $projectProfileFilePath;
|
||||
}
|
||||
|
||||
$profileData = file_get_contents($projectProfileFilePath);
|
||||
|
Reference in New Issue
Block a user