From: Reini U. <ru...@us...> - 2004-11-01 10:44:09
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22479/WikiDB/backend Modified Files: ADODB.php PearDB.php Log Message: seperate PassUser methods into seperate dir (memory usage) fix WikiUser (old) overlarge data session remove wikidb arg from various page class methods, use global ->_dbi instead ... Index: ADODB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/ADODB.php,v retrieving revision 1.45 retrieving revision 1.46 diff -u -2 -b -p -d -r1.45 -r1.46 --- ADODB.php 14 Oct 2004 17:19:17 -0000 1.45 +++ ADODB.php 1 Nov 2004 10:43:58 -0000 1.46 @@ -185,5 +185,5 @@ extends WikiDB_backend } - function _extract_page_data(&$data, $hits) { + function _extract_page_data($data, $hits) { $pagedata = empty($data) ? array() : $this->_unserialize($data); $pagedata['hits'] = $hits; @@ -339,5 +339,5 @@ extends WikiDB_backend } - function _extract_version_data_num(&$row, $want_content) { + function _extract_version_data_num($row, $want_content) { if (!$row) return false; @@ -359,5 +359,5 @@ extends WikiDB_backend } - function _extract_version_data_assoc(&$row) { + function _extract_version_data_assoc($row) { if (!$row) return false; @@ -927,5 +927,5 @@ class WikiDB_backend_ADODB_generic_iter extends WikiDB_backend_iterator { - function WikiDB_backend_ADODB_generic_iter(&$backend, &$query_result, $field_list = NULL) { + function WikiDB_backend_ADODB_generic_iter($backend, $query_result, $field_list = NULL) { $this->_backend = &$backend; $this->_result = $query_result; @@ -1173,4 +1173,10 @@ extends WikiDB_backend_ADODB_generic_ite // $Log$ +// Revision 1.46 2004/11/01 10:43:58 rurban +// seperate PassUser methods into seperate dir (memory usage) +// fix WikiUser (old) overlarge data session +// remove wikidb arg from various page class methods, use global ->_dbi instead +// ... +// // Revision 1.45 2004/10/14 17:19:17 rurban // allow most_popular sortby arguments Index: PearDB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v retrieving revision 1.62 retrieving revision 1.63 diff -u -2 -b -p -d -r1.62 -r1.63 --- PearDB.php 14 Oct 2004 19:19:34 -0000 1.62 +++ PearDB.php 1 Nov 2004 10:43:58 -0000 1.63 @@ -36,5 +36,5 @@ extends WikiDB_backend } $dbh->setErrorHandling(PEAR_ERROR_CALLBACK, - array(&$this, '_pear_error_callback')); + array($this, '_pear_error_callback')); $dbh->setFetchMode(DB_FETCHMODE_ASSOC); @@ -76,4 +76,7 @@ extends WikiDB_backend $this->_dbh->disconnect(); + + global $ErrorManager; + $ErrorManager->popErrorHandler(); } @@ -126,5 +129,5 @@ extends WikiDB_backend } - function _extract_page_data(&$query_result) { + function _extract_page_data($query_result) { extract($query_result); if (isset($query_result['pagedata'])) { @@ -280,5 +283,5 @@ extends WikiDB_backend } - function _extract_version_data(&$query_result) { + function _extract_version_data($query_result) { if (!$query_result) return false; @@ -970,5 +973,5 @@ class WikiDB_backend_PearDB_generic_iter extends WikiDB_backend_iterator { - function WikiDB_backend_PearDB_generic_iter(&$backend, &$query_result) { + function WikiDB_backend_PearDB_generic_iter($backend, $query_result) { if (DB::isError($query_result)) { // This shouldn't happen, I thought. @@ -1036,4 +1039,10 @@ extends WikiDB_backend_PearDB_generic_it } // $Log$ +// Revision 1.63 2004/11/01 10:43:58 rurban +// seperate PassUser methods into seperate dir (memory usage) +// fix WikiUser (old) overlarge data session +// remove wikidb arg from various page class methods, use global ->_dbi instead +// ... +// // Revision 1.62 2004/10/14 19:19:34 rurban // loadsave: check if the dumped file will be accessible from outside. |