[phpwiki-checkins] SF.net SVN: phpwiki:[10599] trunk/lib/WikiDB/backend/file.php

[<var...@us...>]

Revision: 10599
          http://sourceforge.net/p/phpwiki/code/10599
Author:   vargenau
Date:     2021-09-29 09:43:26 +0000 (Wed, 29 Sep 2021)
Log Message:
-----------
lib/WikiDB/backend/file.php: better test _loadPage

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/file.php

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-09-28 15:43:33 UTC (rev 10598)
+++ trunk/lib/WikiDB/backend/file.php	2021-09-29 09:43:26 UTC (rev 10599)
@@ -98,9 +98,16 @@
     protected function _loadPage($type, $pagename, $version, $set_pagename = true)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
-        if (!file_exists($filename)) return NULL;
-        if (!filesize($filename)) return array();
-        if ($fd = @fopen($filename, "rb")) {
+        if (!file_exists($filename)) {
+            return NULL;
+        }
+        if (is_dir($filename)) {
+            return array();
+        }
+        if (!filesize($filename)) {
+            return array();
+        }
+        if ($fd = fopen($filename, "rb")) {
             $locked = flock($fd, LOCK_SH); // Read lock
             if (!$locked) {
                 ExitWiki("Timeout while obtaining lock. Please try again");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.