From: <var...@us...> - 2019-04-18 16:14:55
|
Revision: 10105 http://sourceforge.net/p/phpwiki/code/10105 Author: vargenau Date: 2019-04-18 16:14:53 +0000 (Thu, 18 Apr 2019) Log Message: ----------- trigger_error("readonly database") only in DEBUG mode Modified Paths: -------------- trunk/lib/WikiDB.php Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2019-04-18 15:37:23 UTC (rev 10104) +++ trunk/lib/WikiDB.php 2019-04-18 16:14:53 UTC (rev 10105) @@ -247,7 +247,9 @@ public function deletePage($pagename) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } // don't create empty revisions of already purged pages. @@ -284,7 +286,9 @@ public function purgePage($pagename) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } $result = $this->_cache->purge_page($pagename); @@ -547,7 +551,9 @@ global $request; if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } assert(is_string($from) && $from != ''); @@ -699,7 +705,9 @@ public function set($key, $newval) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } if (!$key || $key[0] == '%') @@ -853,7 +861,9 @@ public function deleteRevision($version) { if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $backend = &$this->_wikidb->_backend; @@ -907,7 +917,9 @@ public function mergeRevision($version) { if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $backend = &$this->_wikidb->_backend; @@ -975,7 +987,9 @@ public function createRevision($version, &$content, $metadata, $links) { if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } $backend = &$this->_wikidb->_backend; @@ -1066,7 +1080,9 @@ global $request; if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } if (is_null($formatted)) @@ -1412,7 +1428,9 @@ and method_exists($backend, 'set_cached_html') ) { if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $backend->set_cached_html($pagename, $newval); @@ -1430,7 +1448,9 @@ } if (isset($this->_wikidb->readonly) and ($this->_wikidb->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $cache->update_pagedata($pagename, array($key => $newval)); @@ -1453,7 +1473,9 @@ public function increaseHitCount() { if ($this->_wikidb->readonly) { - trigger_error("readonly database", E_USER_NOTICE); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_NOTICE); + } return; } if (method_exists($this->_wikidb->_backend, 'increaseHitCount')) @@ -2243,7 +2265,9 @@ { assert(is_string($pagename) && $pagename != ''); if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } @@ -2273,7 +2297,9 @@ public function delete_page($pagename) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } $result = $this->_backend->delete_page($pagename); @@ -2284,7 +2310,9 @@ public function purge_page($pagename) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return false; } $result = $this->_backend->purge_page($pagename); @@ -2343,7 +2371,9 @@ //unset($this->_versiondata_cache[$pagename][$version]); if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $this->_backend->set_versiondata($pagename, $version, $data); @@ -2357,7 +2387,9 @@ public function update_versiondata($pagename, $version, $data) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $this->_backend->update_versiondata($pagename, $version, $data); @@ -2372,7 +2404,9 @@ public function delete_versiondata($pagename, $version) { if (!empty($this->readonly)) { - trigger_error("readonly database", E_USER_WARNING); + if ((int)DEBUG) { + trigger_error("readonly database", E_USER_WARNING); + } return; } $this->_backend->delete_versiondata($pagename, $version); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |