|
From: <var...@us...> - 2021-07-27 13:32:40
|
Revision: 10369
http://sourceforge.net/p/phpwiki/code/10369
Author: vargenau
Date: 2021-07-27 13:32:39 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Add {}
Modified Paths:
--------------
trunk/lib/WikiDB/backend/flatfile.php
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2021-07-27 12:04:28 UTC (rev 10368)
+++ trunk/lib/WikiDB/backend/flatfile.php 2021-07-27 13:32:39 UTC (rev 10369)
@@ -118,7 +118,6 @@
// versiondata: _cached_html and the rest
function _savePageData($pagename, $data)
{
-
$type = 'page_data';
$version = 1;
$filename = $this->_pagename2filename($type, $pagename, $version);
@@ -132,8 +131,9 @@
and is_array($cache->_pagedata_cache[$pagename])
) {
$cachedata = &$cache->_pagedata_cache[$pagename];
- foreach ($data as $key => $val)
+ foreach ($data as $key => $val) {
$cachedata[$key] = $val;
+ }
} else {
$cache->_pagedata_cache[$pagename] = $data;
}
@@ -150,22 +150,26 @@
$latestversion = $this->_getLatestVersion($pagename);
if ($latestversion < $version) {
$oldversiondata = $this->_loadVersionData($pagename, $latestversion);
- if ($oldversiondata)
+ if ($oldversiondata) {
$olddata['versiondata'] = array_merge($oldversiondata, $olddata['versiondata']);
+ }
}
}
$data['pagedata'] = array_merge($olddata['pagedata'], $data['pagedata']);
$data['versiondata'] = array_merge($olddata['versiondata'], $data['versiondata']);
- if (empty($data['versiondata']['%content']))
+ if (empty($data['versiondata']['%content'])) {
$data['versiondata']['%content'] = $olddata['content'];
+ }
$current = new WikiDB_PageRevision($this->_wikidb, $pagename, $version, $data['versiondata']);
unset ($data['versiondata']);
foreach ($data as $k => $v) {
- if ($k == 'pagedata')
+ if ($k == 'pagedata') {
$current->_data = array_merge($current->_data, $v);
- elseif ($k == 'versiondata')
- $current->_data = array_merge($current->_data, $v); else
+ } elseif ($k == 'versiondata') {
+ $current->_data = array_merge($current->_data, $v);
+ } else {
$current->_data[$k] = $v;
+ }
}
$this->_page_data = $current->_data;
$pagedata = "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|