svn: /phd/trunk/phpdotnet/phd/ MediaManager.php
| From: | Dave Barr | Date: | Wed, 12 Aug 2009 11:07:15 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/ MediaManager.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4649@lists.php.net to get a copy of this message | ||
dave Wed, 12 Aug 2009 11:07:15 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287152
Log:
- Fixed broken image copying due to SVN directory restructure.
Changed paths:
U phd/trunk/phpdotnet/phd/MediaManager.php
Modified: phd/trunk/phpdotnet/phd/MediaManager.php
===================================================================
--- phd/trunk/phpdotnet/phd/MediaManager.php 2009-08-12 09:18:41 UTC (rev 287151)
+++ phd/trunk/phpdotnet/phd/MediaManager.php 2009-08-12 11:07:15 UTC (rev 287152)
@@ -87,6 +87,7 @@
{
$fullpath = $this->output_dir . '/' . $newpath;
$fullfilename = $this->relative_source_path . $filename;
+ $altfullfilename = $this->relative_source_path . '../' . $filename;
if (file_exists($fullpath)) {
//no need to copy over again
@@ -94,8 +95,12 @@
}
if (!file_exists($fullfilename)) {
- trigger_error('Image does not exist: ' . $fullfilename, E_USER_WARNING);
- return;
+ if (!file_exists($altfullfilename)) {
+ trigger_error('Image does not exist: ' . $fullfilename, E_USER_WARNING);
+ return;
+ }
+
+ $fullfilename = $altfullfilename;
}
if (!$this->media_dir_exists) {