cvs: pear-core /PEAR/PackageFile v2.php

cellog Fri May 25 19:38:06 2007 UTC

Modified files:
/pear-core/PEAR/PackageFile v2.php
Log:
add missing require_once

http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.136 pear-core/PEAR/PackageFile/v2.php:1.137
--- pear-core/PEAR/PackageFile/v2.php:1.136 Tue Feb 20 00:16:12 2007
+++ pear-core/PEAR/PackageFile/v2.php Fri May 25 19:38:06 2007
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v2.php,v 1.136 2007/02/20 00:16:12 cellog Exp $
+ * @version CVS: $Id: v2.php,v 1.137 2007/05/25 19:38:06 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -1947,16 +1947,16 @@
$this->getTasksNs();
// transform all '-' to '/' and 'tasks:' to '' so tasks:replace becomes replace
$task = str_replace(array($this->_tasksNs . ':', '-'), array('', ' '), $task);
- $task = str_replace(' ', '/', ucwords($task));
- $ps = (strtolower(substr(PHP_OS, 0, 3)) == 'win') ? ';' : ':';
- foreach (explode($ps, ini_get('include_path')) as $path) {
- if (file_exists($path . "/PEAR/Task/$task.php")) {
- include_once "PEAR/Task/$task.php";
- $task = str_replace('/', '_', $task);
- if (class_exists("PEAR_Task_$task")) {
- return "PEAR_Task_$task";
- }
- }
+ $taskfile = str_replace(' ', '/', ucwords($task));
+ $task = str_replace('/', '_', $task);
+ if (class_exists("PEAR_Task_$task")) {
+ return "PEAR_Task_$task";
+ }
+ $fp = @fopen("PEAR/Task/$taskfile.php", 'r', true);
+ if ($fp) {
+ fclose($fp);
+ require_once "PEAR/Task/$taskfile.php";
+ return "PEAR_Task_$task";
}
return false;
}

I hadn't realized this code was not yet committed. This is actually a
fix for tasks with "-" in the name coupled with a better check for if
the file is in the include_path

Greg Beaver wrote:
> cellog Fri May 25 19:38:06 2007 UTC
>
> Modified files:
> /pear-core/PEAR/PackageFile v2.php
> Log:
> add missing require_once
>
> http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
> Index: pear-core/PEAR/PackageFile/v2.php
> diff -u pear-core/PEAR/PackageFile/v2.php:1.136 pear-core/PEAR/PackageFile/v2.php:1.137
> --- pear-core/PEAR/PackageFile/v2.php:1.136 Tue Feb 20 00:16:12 2007
> +++ pear-core/PEAR/PackageFile/v2.php Fri May 25 19:38:06 2007
> @@ -15,7 +15,7 @@
> * @author Greg Beaver <cellog@php.net>
> * @copyright 1997-2006 The PHP Group
> * @license http://www.php.net/license/3_0.txt PHP License 3.0
> - * @version CVS: $Id: v2.php,v 1.136 2007/02/20 00:16:12 cellog Exp $
> + * @version CVS: $Id: v2.php,v 1.137 2007/05/25 19:38:06 cellog Exp $
> * @link http://pear.php.net/package/PEAR
> * @since File available since Release 1.4.0a1
> */
> @@ -1947,16 +1947,16 @@
> $this->getTasksNs();
> // transform all '-' to '/' and 'tasks:' to '' so tasks:replace becomes replace
> $task = str_replace(array($this->_tasksNs . ':', '-'), array('', ' '), $task);
> - $task = str_replace(' ', '/', ucwords($task));
> - $ps = (strtolower(substr(PHP_OS, 0, 3)) == 'win') ? ';' : ':';
> - foreach (explode($ps, ini_get('include_path')) as $path) {
> - if (file_exists($path . "/PEAR/Task/$task.php")) {
> - include_once "PEAR/Task/$task.php";
> - $task = str_replace('/', '_', $task);
> - if (class_exists("PEAR_Task_$task")) {
> - return "PEAR_Task_$task";
> - }
> - }
> + $taskfile = str_replace(' ', '/', ucwords($task));
> + $task = str_replace('/', '_', $task);
> + if (class_exists("PEAR_Task_$task")) {
> + return "PEAR_Task_$task";
> + }
> + $fp = @fopen("PEAR/Task/$taskfile.php", 'r', true);
> + if ($fp) {
> + fclose($fp);
> + require_once "PEAR/Task/$taskfile.php";
> + return "PEAR_Task_$task";
> }
> return false;
> }
>
>