svn: /web/doc-editor/trunk/php/ File.php

From: Date: Tue, 27 Apr 2010 23:12:25 +0000
Subject: svn: /web/doc-editor/trunk/php/ File.php
Groups: php.doc.web 
Request: Send a blank email to doc-web+get-1823@lists.php.net to get a copy of this message
yannick Tue, 27 Apr 2010 23:12:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298679 Log: Fix path Changed paths: U web/doc-editor/trunk/php/File.php Modified: web/doc-editor/trunk/php/File.php =================================================================== --- web/doc-editor/trunk/php/File.php 2010-04-27 22:56:50 UTC (rev 298678) +++ web/doc-editor/trunk/php/File.php 2010-04-27 23:12:25 UTC (rev 298679) @@ -36,13 +36,13 @@ if (strlen($path) > 0) { - $this->full_path = $appConf[$project]['vcs.path'].'/'.$lang.'/'.$path.'/'.$name; + $this->full_path = $appConf[$project]['vcs.path'].$lang.'/'.$path.'/'.$name; // The fallback file : if the file don't exist, we fallback to the EN file witch should always exist - $this->full_path_fallback = $appConf[$project]['vcs.path'].'/en/'.$path.'/'.$name; + $this->full_path_fallback = $appConf[$project]['vcs.path'].'en/'.$path.'/'.$name; } else { - $this->full_path = $appConf[$project]['vcs.path'].'/'.$lang.'/'.$name; - $this->full_path_fallback = $appConf[$project]['vcs.path'].'/en/'.$name; + $this->full_path = $appConf[$project]['vcs.path'].$lang.'/'.$name; + $this->full_path_fallback = $appConf[$project]['vcs.path'].'en/'.$name; } } @@ -332,7 +332,7 @@ $project = $am->project; $ext = ($isPatch) ? '.' . $uniqID . '.patch' : '.new'; - $cmd = 'cd '.$appConf[$project]['vcs.path'].$this->lang.$this->path.'; ' + $cmd = 'cd '.$this->full_path.'; ' .'diff -u '.$this->name.' '.$this->name.$ext; $output = array(); @@ -357,14 +357,14 @@ if( $type == 'vcs' ) { $output = VCSFactory::getInstance()->diff( - $this->lang.$this->path, + $this->lang."/".$this->path, $this->name, $options['rev1'], $options['rev2'] ); } elseif( $type == 'file' || $type == 'patch' ) { $ext = ( $options['type'] == 'patch' ) ? '.' . $options['uniqID'] . '.patch' : '.new'; - $cmd = 'cd '.$appConf[$project]['vcs.path'].$this->lang.$this->path.'; ' + $cmd = 'cd '.$this->full_path.'; ' .'diff -u '.$this->name.' '.$this->name.$ext; $output = array();

« previous php.doc.web (#1823) next »