wez Tue May 25 11:24:47 2004 EDT
Modified files:
/livedocs livedoc_funcs.php xml_classes5.php
Log:
A couple of tweaks
http://cvs.php.net/diff.php/livedocs/livedoc_funcs.php?r1=1.1&r2=1.2&ty=u
Index: livedocs/livedoc_funcs.php
diff -u livedocs/livedoc_funcs.php:1.1 livedocs/livedoc_funcs.php:1.2
--- livedocs/livedoc_funcs.php:1.1 Tue May 25 07:33:48 2004
+++ livedocs/livedoc_funcs.php Tue May 25 11:24:46 2004
@@ -18,12 +18,15 @@
$nav = "<table class='nav' border='0' cellpadding='0' cellspacing='0'
width='150'>";
/* Get the fileinfo for the reference */
- list($tr) = sqlite_array_query($idx, "SELECT title, filename, idents.fileid,
files.dirid from idents left join files where id='$current_page' and
idents.fileid=files.fileid", SQLITE_NUM);
+ $tr = sqlite_array_query($idx, "SELECT title, filename, idents.fileid,
files.dirid from idents left join files where id='$current_page' and
idents.fileid=files.fileid", SQLITE_NUM);
if (!$tr) {
- list($tr) = sqlite_array_query($fb_idx, "SELECT title, filename,
idents.fileid, files.dirid from idents left join files where id='$current_page' and
idents.fileid=files.fileid", SQLITE_NUM);
+ $tr = sqlite_array_query($fb_idx, "SELECT title, filename,
idents.fileid, files.dirid from idents left join files where id='$current_page' and
idents.fileid=files.fileid", SQLITE_NUM);
}
if ($tr) {
+ list($tr) = $tr;
list($title, $filename, $fileid, $dirid) = $tr;
+ } else {
+ $tr = array('?', '', -1, -1);
}
/* Get parent ID and child IDs */
http://cvs.php.net/diff.php/livedocs/xml_classes5.php?r1=1.1&r2=1.2&ty=u
Index: livedocs/xml_classes5.php
diff -u livedocs/xml_classes5.php:1.1 livedocs/xml_classes5.php:1.2
--- livedocs/xml_classes5.php:1.1 Tue May 25 07:33:48 2004
+++ livedocs/xml_classes5.php Tue May 25 11:24:46 2004
@@ -19,7 +19,7 @@
// | PHP 5 style |
// +----------------------------------------------------------------------+
//
-// $Id: xml_classes5.php,v 1.1 2004/05/25 11:33:48 wez Exp $
+// $Id: xml_classes5.php,v 1.2 2004/05/25 15:24:46 wez Exp $
class Node { /* {{{ */
@@ -136,7 +136,7 @@
$this->tagname = $tagname;
$this->attributes = $attributes;
- $GLOBALS['__node_count']++;
+ @$GLOBALS['__node_count']++;
}
function set_parent($parent)
