[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/inc class.sowiki.inc.php,1.4,1.5
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: wiki/inc class.sowiki.inc.php,1.4,1.5 |
Date: |
Wed, 05 Mar 2003 08:07:30 -0500 |
Update of /cvsroot/phpgroupware/wiki/inc
In directory subversions:/tmp/cvs-serv29972
Modified Files:
class.sowiki.inc.php
Log Message:
update for pgsql
Index: class.sowiki.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/inc/class.sowiki.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sowiki.inc.php 4 Mar 2003 23:10:54 -0000 1.4
--- class.sowiki.inc.php 5 Mar 2003 13:07:28 -0000 1.5
***************
*** 94,98 ****
$this->exists = 1;
$this->version = $this->db->f('version');
! $this->mutable = ($this->db->f('mutable') == 'on');
$this->username = $this->db->f('username');
$this->text = $this->db->f('body');
--- 94,98 ----
$this->exists = 1;
$this->version = $this->db->f('version');
! $this->mutable = !strncmp($this->db->f('mutable'),'on',2);
$this->username = $this->db->f('username');
$this->text = $this->db->f('body');
***************
*** 181,188 ****
function find($text)
{
! $this->db->query("SELECT
t1.title,t1.version,t1.body,MAX(t2.version)".
" FROM $this->PgTbl AS t1,$this->PgTbl AS t2".
! " WHERE t1.title=t2.title GROUP BY
t2.title,t1.version".
! " HAVING t1.version=MAX(t2.version) AND (body
LIKE '%$text%' OR title LIKE '%$text%')",
__LINE__,__FILE__);
$list = array();
--- 181,189 ----
function find($text)
{
! $this->db->query("SELECT t1.title,t1.version,MAX(t2.version)".
" FROM $this->PgTbl AS t1,$this->PgTbl AS t2".
! " WHERE t1.title=t2.title ".
! " GROUP BY t1.title,t1.version,t1.body".
! " HAVING t1.version=MAX(t2.version) AND
(t1.body LIKE '%$text%' OR t1.title LIKE '%$text%')",
__LINE__,__FILE__);
$list = array();
***************
*** 411,415 ****
" LENGTH(t1.body) AS
length,t1.comment,t1.mutable,t1.version,MAX(t2.version)" .
" FROM $this->PgTbl AS t1, $this->PgTbl
AS t2" .
! " WHERE t1.title = t2.title GROUP BY
t2.title, t1.version" .
" HAVING t1.version =
MAX(t2.version)",__LINE__,__FILE__);
$list = array();
--- 412,417 ----
" LENGTH(t1.body) AS
length,t1.comment,t1.mutable,t1.version,MAX(t2.version)" .
" FROM $this->PgTbl AS t1, $this->PgTbl
AS t2" .
! " WHERE t1.title = t2.title".
! " GROUP BY
t1.title,t1.version,t1.time,t1.author,t1.username,t1.body,t1.comment,t1.mutable"
.
" HAVING t1.version =
MAX(t2.version)",__LINE__,__FILE__);
$list = array();
***************
*** 417,421 ****
{
$page = $this->db->Record;
! $page['mutable'] = $page[6] = $page['mutable'] == 'on';
$list[] = $page;
}
--- 419,423 ----
{
$page = $this->db->Record;
! $page['mutable'] = $page[6] =
!strncmp($page['mutable'],'on',2);
$list[] = $page;
}
***************
*** 453,457 ****
$this->db->query("SELECT
t1.time,t1.title,t1.author,t1.username,0,t1.comment,t1.version,MAX(t2.version)
" .
" FROM $this->PgTbl AS t1,$this->PgTbl AS t2" .
! " WHERE t1.title=t2.title GROUP BY
t2.title,t1.version".
" HAVING t1.version = MAX(t2.version) AND
t1.body=''",__LINE__,__FILE__);
$list = array();
--- 455,460 ----
$this->db->query("SELECT
t1.time,t1.title,t1.author,t1.username,0,t1.comment,t1.version,MAX(t2.version)
" .
" FROM $this->PgTbl AS t1,$this->PgTbl AS t2" .
! " WHERE t1.title=t2.title".
! " GROUP BY
t1.title,t1.version,t1.time,t1.author,t1.username,t1.comment".
" HAVING t1.version = MAX(t2.version) AND
t1.body=''",__LINE__,__FILE__);
$list = array();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/inc class.sowiki.inc.php,1.4,1.5,
Ralf Becker <address@hidden> <=