Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11896
Modified Files:
search.php
Log Message:
fix bug 961091 with provided patch
Index: search.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** search.php 26 Dec 2008 08:26:31 -0000 1.43
--- search.php 26 Dec 2008 09:05:15 -0000 1.44
***************
*** 110,119 ****
while ($and_arr[$i] == 'or') {
$or_arr[$j][] = $and_arr[$i-1];
! unset($and_arr[$i], $and_arr[$i-1]);
! $i += 2;
}
! if (isset($and_arr[$i-1])) {
! $or_arr[$j][] = $and_arr[$i-1];
! unset($and_arr[$i-1]);
}
$or_str_arr[$j] = implode('</b> OR <b>', $or_arr[$j]);
--- 110,119 ----
while ($and_arr[$i] == 'or') {
$or_arr[$j][] = $and_arr[$i-1];
! array_splice($and_arr,$i-1,2);
! $i--;
}
! if (isset($and_arr[$i])) {
! $or_arr[$j][] = $and_arr[$i];
! array_splice($and_arr,$i,1);
}
$or_str_arr[$j] = implode('</b> OR <b>', $or_arr[$j]);
***************
*** 126,133 ****
if (substr($val,0,1) == '-') {
$not_arr[] = substr($val,1);
! unset($and_arr[$key]);
} elseif(substr($val,0,1) == '+') {
$and_arr[] = substr($val,1);
! unset($and_arr[$key]);
}
}
--- 126,133 ----
if (substr($val,0,1) == '-') {
$not_arr[] = substr($val,1);
! array_splice($and_arr,$key,1);
} elseif(substr($val,0,1) == '+') {
$and_arr[] = substr($val,1);
! array_splice($and_arr,$key,1);
}
}
|
