Added more fixes for PHP 5.2.0.

This commit is contained in:
Loic d'Anterroches 2008-09-05 14:38:50 +02:00
parent c8e91d80f2
commit f4cbf84559
2 changed files with 3 additions and 3 deletions

View File

@ -233,7 +233,7 @@ class IDF_Project extends Pluf_Model
$false = Pluf_DB_BooleanToDb(false, $db); $false = Pluf_DB_BooleanToDb(false, $db);
$sql = new Pluf_SQL('model_class=%s AND model_id=%s AND owner_class=%s AND permission=%s AND negative='.$false, $sql = new Pluf_SQL('model_class=%s AND model_id=%s AND owner_class=%s AND permission=%s AND negative='.$false,
array('IDF_Project', $this->id, 'Pluf_User', $operm->id)); array('IDF_Project', $this->id, 'Pluf_User', $operm->id));
$owners = array(); $owners = new Pluf_Template_ContextVars(array());
foreach ($grow->getList(array('filter' => $sql->gen())) as $row) { foreach ($grow->getList(array('filter' => $sql->gen())) as $row) {
if ($fmt == 'objects') { if ($fmt == 'objects') {
$owners[] = Pluf::factory('Pluf_User', $row->owner_id); $owners[] = Pluf::factory('Pluf_User', $row->owner_id);
@ -243,7 +243,7 @@ class IDF_Project extends Pluf_Model
} }
$sql = new Pluf_SQL('model_class=%s AND model_id=%s AND owner_class=%s AND permission=%s AND negative='.$false, $sql = new Pluf_SQL('model_class=%s AND model_id=%s AND owner_class=%s AND permission=%s AND negative='.$false,
array('IDF_Project', $this->id, 'Pluf_User', $mperm->id)); array('IDF_Project', $this->id, 'Pluf_User', $mperm->id));
$members = array(); $members = new Pluf_Template_ContextVars(array());
foreach ($grow->getList(array('filter' => $sql->gen())) as $row) { foreach ($grow->getList(array('filter' => $sql->gen())) as $row) {
if ($fmt == 'objects') { if ($fmt == 'objects') {
$members[] = Pluf::factory('Pluf_User', $row->owner_id); $members[] = Pluf::factory('Pluf_User', $row->owner_id);

View File

@ -133,7 +133,7 @@ class IDF_Views_Source
$page_title = $bc.' - '.$title; $page_title = $bc.' - '.$title;
$cobject = $scm->getCommit($commit); $cobject = $scm->getCommit($commit);
$tree_in = in_array($commit, $branches); $tree_in = in_array($commit, $branches);
$res = $scm->filesAtCommit($commit, $request_file); $res = new Pluf_Template_ContextVars($scm->filesAtCommit($commit, $request_file));
// try to find the previous level if it exists. // try to find the previous level if it exists.
$prev = split('/', $request_file); $prev = split('/', $request_file);
$l = array_pop($prev); $l = array_pop($prev);