--- db/prgsrc/drupal/modules/chgk_db/classes/DbField.class.php 2010/02/28 20:17:33 1.1
+++ db/prgsrc/drupal/modules/chgk_db/classes/DbField.class.php 2010/03/08 16:19:22 1.2
@@ -25,15 +25,20 @@ class DbField {
}
public function formatHtml() {
+ $this->html = preg_replace('/\[Раздаточный материал:(.*?)\]\s*\n/sm',
+ "
\\1
\n",
+ $this->html );
+ $this->html = preg_replace('/^\s*<раздатка>(.*?)<\/раздатка>/sm',
+ " \\1
\n",
+ $this->html );
+
$this->html = preg_replace('/^\s+/m', "
\n ", $this->html);
- if (!preg_match('/^\|/m')) {
+ if (!preg_match('/^\|/m',$this->html)) {
$this->html = preg_replace('/\s+\/m',' \', $this->html);
- }
-
+ }
$this->html = preg_replace('/\(pic: ([^\)]*)\)/','', $this->html);
-
}
public function getName() {