svn: /web/doc-editor/trunk/php/ RepositoryFetcher.php class.php

yannick                                  Thu, 01 Oct 2009 03:55:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289036

Log:
remove '1.' string before revision number in UI

Changed paths:
    U   web/doc-editor/trunk/php/RepositoryFetcher.php
    U   web/doc-editor/trunk/php/class.php

Modified: web/doc-editor/trunk/php/RepositoryFetcher.php
===================================================================
--- web/doc-editor/trunk/php/RepositoryFetcher.php	2009-10-01 02:43:53 UTC (rev 289035)
+++ web/doc-editor/trunk/php/RepositoryFetcher.php	2009-10-01 03:55:27 UTC (rev 289036)
@@ -141,8 +141,8 @@
                     "id"          => $a->id,
                     "path"        => $a->path,
                     "name"        => $a->name,
-                    "revision"    => '1.'.$a->revision,
-                    "en_revision" => '1.'.$a->en_revision,
+                    "revision"    => $a->revision,
+                    "en_revision" => $a->en_revision,
                     "maintainer"  => $a->maintainer,
                     "needcommit"  => false,
                     "isCritical"  => ( ($a->en_revision - $a->revision >= 10) || $a->size_diff >= 3 || $a->mdate_diff <= -30 ) ? true : false

Modified: web/doc-editor/trunk/php/class.php
===================================================================
--- web/doc-editor/trunk/php/class.php	2009-10-01 02:43:53 UTC (rev 289035)
+++ web/doc-editor/trunk/php/class.php	2009-10-01 03:55:27 UTC (rev 289036)
@@ -797,8 +797,8 @@
     function getModifiedFiles() {

         // Get Modified Files
-        $s = sprintf('SELECT `id`, `lang`, `path`, `name`, CONCAT("1.", `revision`) AS `revision`,
-        CONCAT("1.", `en_revision`) AS `en_revision`, `maintainer`, `reviewed` FROM `pendingCommit` WHERE
+        $s = sprintf('SELECT `id`, `lang`, `path`, `name`, `revision`,
+        `en_revision`, `maintainer`, `reviewed` FROM `pendingCommit` WHERE
         `lang`="%s" OR `lang`="en"', $this->cvsLang);

         $r = $this->db->query($s) or die('Error: '.$this->db->error.'|'.$s);
@@ -863,12 +863,12 @@

                 if (isset($ModifiedFiles['en'.$a->path.$a->name])) {
                     $new_en_revision = $ModifiedFiles['en'.$a->path.$a->name]['revision'];
-                    $new_revision    = '1.'.$a->revision;
+                    $new_revision    = $a->revision;
                     $new_maintainer  = $a->maintainer;
                 }

                 if (isset($ModifiedFiles[$this->cvsLang.$a->path.$a->name])) {
-                    $new_en_revision = '1.'.$a->en_revision;
+                    $new_en_revision = $a->en_revision;
                     $new_revision    = $ModifiedFiles[$this->cvsLang.$a->path.$a->name]['en_revision'];
                     $new_maintainer  = $ModifiedFiles[$this->cvsLang.$a->path.$a->name]['maintainer'];
                 }
@@ -888,8 +888,8 @@
                 "id"          => $a->id,
                 "path"        => $a->path,
                 "name"        => $a->name,
-                "revision"    => '1.'.$a->revision,
-                "en_revision" => '1.'.$a->en_revision,
+                "revision"    => $a->revision,
+                "en_revision" => $a->en_revision,
                 "maintainer"  => $a->maintainer,
                 "needcommit"  => false,
                 "isCritical"  => ( ($a->en_revision - $a->revision >= 10) || $a->size_diff >= 3 || $a->mdate_diff <= -30 ) ? true : false