* mbstring.func_overload fix

* TexySectionModule moved to module repository
jkrcma · May 24, 2007 · edf27b3 · edf27b3
1 parent e0d0e1d
commit edf27b3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 99 deletions.
diff --git a/changelog.cs.texy b/changelog.cs.texy
@@ -1,14 +1,16 @@
 Changelog
 *********
 
-Verze 2.0 Release Candidate 1 (rev. 126)
+Verze 2.0 Release Candidate 1 (rev. 128)
 =========
 
-20. 5. 2007 .[date]
+23. 5. 2007 .[date]
 
 - vnitřní DTD validátor TexyHtmlCleaner nyní kontroluje i platnost atributů
 - opravena chyba zadávání atributů před modifikátor .{attr:value}
 - změna názvu $texy->formatterModule -> $texy->cleaner
+- vráceno zpět $texy->tabWidth
+- mbstring.func_overload fix
 
 
 Verze 2.0 Release Candidate 1 (rev. 125)
@@ -37,7 +39,6 @@ Verze 2.0 Release Candidate 1 (rev. 119)
 - Texy2 by mělo být připraveno na ostrý provoz
 - kompaktní knihovna přejmenována `texy-compact.php` -> `texy.compact.php`
 - TexyDefinitionListModule začleněn do TexyListModule
-- nová syntax `---section---` -> rozdělení dokumentu do sekcí (TexySectionModule)
 
 
 Verze 2.0 beta (rev. 113)

diff --git a/examples/handler/handler.php b/examples/handler/handler.php
@@ -185,16 +185,6 @@ public function heading($parser, $level, $content, $modifier, $isSurrounded)
         // return $parser->texy->headingModule->solve($level, $content, $modifier, $isSurrounded);
     }
 
-    /**
-     * @param TexyBlockParser
-     * @param string
-     * @return TexyHtml|string|FALSE|Texy::PROCEED
-     */
-    public function section($parser, $content)
-    {
-        // return $parser->texy->headingModule->solveSection($content);
-    }
-
     /**
      * @param TexyBlockParser
      * @param string

diff --git a/texy/modules/TexySectionModule.php b/texy/modules/TexySectionModule.php
diff --git a/texy/texy.php b/texy/texy.php
@@ -53,7 +53,6 @@
 require_once TEXY_DIR.'modules/TexyQuoteModule.php';
 require_once TEXY_DIR.'modules/TexyScriptModule.php';
 require_once TEXY_DIR.'modules/TexyEmoticonModule.php';
-require_once TEXY_DIR.'modules/TexySectionModule.php';
 require_once TEXY_DIR.'modules/TexyTableModule.php';
 require_once TEXY_DIR.'modules/TexyTypographyModule.php';
 
@@ -161,8 +160,6 @@ class Texy
         $figureModule,
         /** @var TexyTypographyModule */
         $typographyModule,
-        /** @var TexySectionModule */
-        $sectionModule,
         /** @var TexyLongWordsModule */
         $longWordsModule;
 
@@ -228,6 +225,15 @@ public function __construct()
 
         $link = new TexyLink('http://en.wikipedia.org/wiki/Special:Search?search=%s');
         $this->linkModule->addReference('wikipedia', $link);
+
+        // mbstring.func_overload fix
+        if (function_exists('mb_get_info')) {
+            $mb = mb_get_info();
+            if ($mb['func_overload'] & 2 && $mb['internal_encoding'][0] === 'U') { // U??
+                mb_internal_encoding('pass');
+                trigger_error('Texy: mb_internal_encoding changed to pass', E_USER_WARNING);
+            }
+        }
     }
 
 
@@ -255,7 +261,6 @@ protected function loadModules()
         $this->listModule = new TexyListModule($this);
         $this->tableModule = new TexyTableModule($this);
         $this->figureModule = new TexyFigureModule($this);
-        $this->sectionModule = new TexySectionModule($this);
 
         // post process - order is not important
         $this->typographyModule = new TexyTypographyModule($this);
@@ -803,7 +808,6 @@ static public function safeMode(Texy $texy)
         $texy->allowed['image'] = FALSE;                    // disable images
         $texy->allowed['link/definition'] = FALSE;          // disable [ref]: URL  reference definitions
         $texy->allowed['html/comment'] = FALSE;             // disable HTML comments
-        $texy->allowed['section'] = FALSE;                  // disable sections
         $texy->linkModule->forceNoFollow = TRUE;            // force rel="nofollow"
     }
 
@@ -826,7 +830,6 @@ static public function trustMode(Texy $texy)
         $texy->allowed['image'] = TRUE;                     // enable images
         $texy->allowed['link/definition'] = TRUE;           // enable [ref]: URL  reference definitions
         $texy->allowed['html/comment'] = TRUE;              // enable HTML comments
-        $texy->allowed['section'] = TRUE;                   // disable sections
         $texy->linkModule->forceNoFollow = FALSE;           // disable automatic rel="nofollow"
     }