--- db/prgsrc/drupal/modules/chgk_db/classes/DbField.class.php 2010/03/08 16:19:22 1.2 +++ db/prgsrc/drupal/modules/chgk_db/classes/DbField.class.php 2010/03/20 17:23:42 1.5 @@ -4,9 +4,9 @@ require_once(dirname(__FILE__)."/DbField class DbField { private $field; - private $value; - private $number; - private $html; + protected $value; + protected $number; + protected $html; public function __construct($field, $value, $number = false) { $this->field = $field; $this->value = $value; @@ -25,6 +25,8 @@ class DbField { } public function formatHtml() { + $this->html = preg_replace('/(\s+)-+(\s+)/','\1—$2', $this->html); + $this->html = preg_replace('/\[Раздаточный материал:(.*?)\]\s*\n/sm', "
Раздаточный материал
\\1
\n", $this->html ); @@ -51,5 +53,9 @@ class DbField { public function isEmpty() { return $this->value === NULL || $this->value===''; - } + } + + public function getValue() { + return $this->value; + } }