D352.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/units/images/images.php
	===================================================================
	--- branches/5.2.x/core/units/images/images.php
	+++ branches/5.2.x/core/units/images/images.php
	@@ -23,7 +23,7 @@
	* @return bool
	* @access public
	*/
	- public function Delete($id)
	+ public function Delete($id = null)
	{
	$this->Load($id);
	$local_path = FULL_PATH . $this->GetDBField('LocalPath');
	@@ -36,7 +36,7 @@
	if ( file_exists($thumb_path) ) {
	unlink($thumb_path);
	}
	-
	+
	return parent::Delete($id);
	}
	-}
	\ No newline at end of file
	+}
	Index: branches/5.2.x/core/units/pdf/pdf_text.php
	===================================================================
	--- branches/5.2.x/core/units/pdf/pdf_text.php
	+++ branches/5.2.x/core/units/pdf/pdf_text.php
	@@ -230,7 +230,7 @@
	}
	}

	- function DrawAt($page, $x, $y, $spacer_w=0)
	+ function DrawAt($page, $x=0, $y=0, $spacer_w=0)
	{
	$page->SetLineWidth(0.1);

	@@ -258,4 +258,4 @@
	$this->CurX = $x;
	}

	-}
	\ No newline at end of file
	+}