phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[10558] trunk/lib/WikiDB.php

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

Revision: 10558
          http://sourceforge.net/p/phpwiki/code/10558
Author:   vargenau
Date:     2021-09-16 17:56:48 +0000 (Thu, 16 Sep 2021)
Log Message:
-----------
Simplify call to rename_page

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-09-16 17:34:48 UTC (rev 10557)
+++ trunk/lib/WikiDB.php	2021-09-16 17:56:48 UTC (rev 10558)
@@ -573,21 +573,7 @@
                 }
             }
         }
-        if ($oldpage->exists() and !$newpage->exists()) {
-            if ($result = $this->_backend->rename_page($from, $to)) {
-                // create a RecentChanges entry with explaining summary
-                $page = $this->getPage($to);
-                $current = $page->getCurrentRevision();
-                $meta = $current->_data;
-                $version = $current->getVersion();
-                $meta['summary'] = sprintf(_("renamed from %s"), $from);
-                unset($meta['mtime']); // force new date
-                $page->save($current->getPackedContent(), $version + 1, $meta);
-            }
-        } elseif (!$oldpage->getCurrentRevision(false) and !$newpage->exists()) {
-            // if a version 0 exists try it also.
-            $result = $this->_backend->rename_page($from, $to);
-        }
+        $result = $this->_backend->rename_page($from, $to);
         /* Generate notification emails? */
         if ($result and ENABLE_MAILNOTIFY) {
             $notify = $this->get('notify');

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10789] trunk/lib/WikiDB.php

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

Revision: 10789
          http://sourceforge.net/p/phpwiki/code/10789
Author:   vargenau
Date:     2021-12-16 15:26:26 +0000 (Thu, 16 Dec 2021)
Log Message:
-----------
Whitespace

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-12-16 15:24:29 UTC (rev 10788)
+++ trunk/lib/WikiDB.php	2021-12-16 15:26:26 UTC (rev 10789)
@@ -2268,23 +2268,23 @@
     {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
-            assert(is_string($pagename) && $pagename != '');
-            $nc = $need_content ? '1' : '0';
-            $cache = &$this->_versiondata_cache;
-            if (!isset($cache[$pagename][$version][$nc])
-                || !(is_array($cache[$pagename]))
-                || !(is_array($cache[$pagename][$version]))
-            ) {
-                $cache[$pagename][$version][$nc] =
-                    $this->_backend->get_versiondata($pagename, $version, $need_content);
-                $readdata = true;
-                // If we have retrieved all data, we may as well set the cache for
-                // $need_content = false
-                if ($need_content) {
-                    $cache[$pagename][$version]['0'] =& $cache[$pagename][$version]['1'];
-                }
+        assert(is_string($pagename) && $pagename != '');
+        $nc = $need_content ? '1' : '0';
+        $cache = &$this->_versiondata_cache;
+        if (!isset($cache[$pagename][$version][$nc])
+            || !(is_array($cache[$pagename]))
+            || !(is_array($cache[$pagename][$version]))
+        ) {
+            $cache[$pagename][$version][$nc] =
+                $this->_backend->get_versiondata($pagename, $version, $need_content);
+            $readdata = true;
+            // If we have retrieved all data, we may as well set the cache for
+            // $need_content = false
+            if ($need_content) {
+                $cache[$pagename][$version]['0'] =& $cache[$pagename][$version]['1'];
             }
-            $vdata = $cache[$pagename][$version][$nc];
+        }
+        $vdata = $cache[$pagename][$version][$nc];
 
         if ($readdata && is_array($vdata) && !empty($vdata['%pagedata'])) {
             if (empty($this->_pagedata_cache))

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