summaryrefslogtreecommitdiff
path: root/inc/parserutils.php
diff options
context:
space:
mode:
authorAdrian Lang <dokuwiki@adrianlang.de>2010-11-13 16:25:43 +0100
committerAdrian Lang <dokuwiki@adrianlang.de>2010-11-13 16:27:22 +0100
commit3903be5dc10c8ce0270ce28c57a5b76df87db4c3 (patch)
treed4ce07d9e87b4878b2a31b8e91a6768b5a7ff8cc /inc/parserutils.php
parentcdf966f1270532404b2a6d2343ed75db32fc0b16 (diff)
downloadrpg-3903be5dc10c8ce0270ce28c57a5b76df87db4c3.tar.gz
rpg-3903be5dc10c8ce0270ce28c57a5b76df87db4c3.tar.bz2
Remove metadata conversion from 0a7e3bce (2006-11-26)
Diffstat (limited to 'inc/parserutils.php')
-rw-r--r--inc/parserutils.php23
1 files changed, 0 insertions, 23 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php
index 27a5190bd..847b0382f 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -337,9 +337,6 @@ function p_purge_metadata($id) {
* read the metadata from source/cache for $id
* (internal use only - called by p_get_metadata & p_set_metadata)
*
- * this function also converts the metadata from the original format to
- * the current format ('current' & 'persistent' arrays)
- *
* @author Christopher Smith <chris@jalakai.co.uk>
*
* @param string $id absolute wiki page id
@@ -356,26 +353,6 @@ function p_read_metadata($id,$cache=false) {
$file = metaFN($id, '.meta');
$meta = @file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
- // convert $meta from old format to new (current+persistent) format
- if (!isset($meta['current'])) {
- $meta = array('current'=>$meta,'persistent'=>$meta);
-
- // remove non-persistent keys
- unset($meta['persistent']['title']);
- unset($meta['persistent']['description']['abstract']);
- unset($meta['persistent']['description']['tableofcontents']);
- unset($meta['persistent']['relation']['haspart']);
- unset($meta['persistent']['relation']['references']);
- unset($meta['persistent']['date']['valid']);
-
- if (empty($meta['persistent']['description'])) unset($meta['persistent']['description']);
- if (empty($meta['persistent']['relation'])) unset($meta['persistent']['relation']);
- if (empty($meta['persistent']['date'])) unset($meta['persistent']['date']);
-
- // save converted metadata
- io_saveFile($file, serialize($meta));
- }
-
if ($cache) {
$cache_metadata[(string)$id] = $meta;
}