[phpwiki-checkins] SF.net SVN: phpwiki:[8649] trunk

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

Revision: 8649
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8649&view=rev
Author:   vargenau
Date:     2012-12-11 16:13:43 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Remove pgsrc_version

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/PageDump.php
    trunk/lib/upgrade.php
    trunk/themes/blog/pgsrc/HomePage

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2012-12-11 16:00:10 UTC (rev 8648)
+++ trunk/lib/editpage.php	2012-12-11 16:13:43 UTC (rev 8649)
@@ -307,10 +307,7 @@
 
         // Include any meta-data from original page version which
         // has not been explicitly updated.
-        // (Except don't propagate pgsrc_version --- moot for now,
-        //  because at present it never gets into the db...)
         $meta = $this->selected->getMetaData();
-        unset($meta['pgsrc_version']);
         $meta = array_merge($meta, $this->meta);
 
         // Save new revision

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-12-11 16:00:10 UTC (rev 8648)
+++ trunk/lib/loadsave.php	2012-12-11 16:13:43 UTC (rev 8649)
@@ -926,10 +926,6 @@
 
     // Try to merge if updated pgsrc contents are different. This
     // whole thing is hackish
-    //
-    // TODO: try merge unless:
-    // if (current contents = default contents && pgsrc_version >=
-    // pgsrc_version) then just upgrade this pgsrc
     $needs_merge = false;
     $merging = false;
     $overwrite = false;

Modified: trunk/lib/plugin/PageDump.php
===================================================================
--- trunk/lib/plugin/PageDump.php	2012-12-11 16:00:10 UTC (rev 8648)
+++ trunk/lib/plugin/PageDump.php	2012-12-11 16:13:43 UTC (rev 8649)
@@ -279,11 +279,6 @@
         $array = explode("\n", $mailified);
 
         // Massage headers to prepare for developer checkin to Subversion.
-        $item_to_insert = "  pgsrc_version=\"2 \$Revision\$\";";
-        $insert_into_key_position = 5;
-        $returnval_ignored = array_splice($array,
-            $insert_into_key_position,
-            0, $item_to_insert);
         /*
             Strip out all this junk:
             author=MeMe;

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-12-11 16:00:10 UTC (rev 8648)
+++ trunk/lib/upgrade.php	2012-12-11 16:13:43 UTC (rev 8649)
@@ -63,9 +63,6 @@
         $this->isSQL = $this->dbi->_backend->isSQL();
     }
 
-    /**
-     * TODO: check for the pgsrc_version number, not the revision mtime only
-     */
     function doPgsrcUpdate($pagename, $path, $filename)
     {
         // don't ever update the HomePage

Modified: trunk/themes/blog/pgsrc/HomePage
===================================================================
--- trunk/themes/blog/pgsrc/HomePage	2012-12-11 16:00:10 UTC (rev 8648)
+++ trunk/themes/blog/pgsrc/HomePage	2012-12-11 16:13:43 UTC (rev 8649)
@@ -1,8 +1,7 @@
-Date: Fri, 10 Sep 2010 13:47:27 +0000
+Date: Tue, 11 Dec 2012 17:12:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=HomePage;
-  pgsrc_version="2 $Revision: 1.1 $";
   flags="";
   markup=2;
   charset=UTF-8

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