fix turkish include, fix JS markup

diff --git a/docs/NEWS b/docs/NEWS
index 923e181949b8fba24c320d99243dd68e6a6c44ae..d0c173e59f6cd7338561fad9b9e6ec40218abdc5 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -39,9 +39,13 @@ Version 1.1-alpha1()
    * Removed config option "XHTML11 compliance" and enabled by default
      now (garvinhicking)
 
-Version 1.0-beta2 ()
+Version 1.0-beta2 (March 13th, 2006)
 ------------------------------------------------------------------------
 
+   * Fix WYSIWYG javascript referencing so that plugins can access their
+     objects (like emoticonchooser). Also replace <i> with <em> and
+     <b> with <strong>. (Jay Bertrandt)
+
    * Fixed chief-editor not being able to create editors (garvinhicking)
 
    * Added turkish language by Ahmet Usal

diff --git a/include/admin/importers/movabletype.inc.php b/include/admin/importers/movabletype.inc.php
index 7acfc4d3831f07f2cff250f676e7cc531eafabdf..3327e62fec37415bc6746c1049a6db193bb40d09 100644 (file)
--- a/include/admin/importers/movabletype.inc.php
+++ b/include/admin/importers/movabletype.inc.php
@@ -177,11 +177,13 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
                 case 'PRIMARY CATEGORY':
                 case 'CATEGORY':
                     $categories = explode("\0", $data);
+                    echo '<pre>' . print_r($this->categories, true) . '</pre>';
                     foreach($categories AS $data) {
                         $data = trim($data);
                         $cat_found  = false;
                         if (is_array($this->categories)) {
                             for ( $y=0 ; $y<sizeof($this->categories) ; $y++ ) {
+                                echo '"' . $this->categories[$y]['category_name'] . '" == "' . $data . '"<br />';
                                 if ( $this->categories[$y]['category_name'] == $data ) {
                                     $cat_found = true;
                                     break;
@@ -423,6 +425,8 @@ class Serendipity_Import_MovableType extends Serendipity_Import {
         if ( !sizeof($tasks) || $force == true ) {
             serendipity_db_begin_transaction();
             foreach ($entries as $entry) {
+                echo '<pre>' . printR_($entry, true) . '</pre><br />';
+                continue;
                 if (empty($entry['authorid'])) {
                     $entry['authorid'] = $serendipity['authorid'];
                     $entry['author']   = $serendipity['realname'];

diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php
index 1bb05b99e847216c35152d77669db4079fcb7361..11bc34f890e9583736880bace36a1cecab032045 100644 (file)
--- a/include/functions_comments.inc.php
+++ b/include/functions_comments.inc.php
@@ -257,7 +257,8 @@ function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace
             if (isset($comment['no_email']) && $comment['no_email']) {
                 $comment['email'] = false;
             } elseif (!empty($comment['email'])) {
-                $comment['email'] = htmlspecialchars(str_replace('@', '[at]', $comment['email']));
+                $comment['clear_email'] = $comment['email'];
+                $comment['email']       = htmlspecialchars(str_replace('@', '[at]', $comment['email']));
             }
 
             $comment['body']    = $comment['comment'];

diff --git a/include/functions_entries_admin.inc.php b/include/functions_entries_admin.inc.php
index 256d058c81ad36995fbf56be15c6df0edb2ef61b..7d5d433697ec3759f136b8141bd427dcf2a25d31 100644 (file)
--- a/include/functions_entries_admin.inc.php
+++ b/include/functions_entries_admin.inc.php
@@ -197,7 +197,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
 
                                 /* Hack to make sure that when the single dropdown is shown, don't have multiple selections */
                                 last = 0;
-                                
+
                                 for (i=0; i < el.options.length; i++) {
                                     if (el.options[i].selected == true) {
                                         selected++;
@@ -221,7 +221,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
                                         break;
                                     }
                                 }
-                                
+
                                 el.selectedIndex = null;
                                 if (last > 0) {
                                     el.selectedIndex = last;
@@ -288,7 +288,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
 ?>
                         return true;
                     }
-                    
+
                     selector_toggle['categoryselector'] = '<?php echo ($categoryselector_expanded ? 'on' : 'off'); ?>';
                     addLoadEvent(showItem);
                     </script>
@@ -305,8 +305,8 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
         if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
                   <script type="text/javascript" language="JavaScript">
-                        document.write('<input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<i>\',\'</i>\')" />');
-                        document.write('<input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<b>\',\'</b>\')" />');
+                        document.write('<input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
+                        document.write('<input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<strong>\',\'</strong>\')" />');
                         document.write('<input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<u>\',\'</u>\')" />');
                         document.write('<input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<blockquote>\',\'</blockquote>\')" />');
                         document.write('<input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms[\'serendipityEntry\'][\'serendipity[body]\'])" />');
@@ -374,8 +374,8 @@ if (!$serendipity['wysiwyg']) {
         /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
         if (eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
-                        <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<i>','</i>')" />
-                        <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<b>','</b>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />
                         <input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
                         <input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
                         <input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
@@ -436,10 +436,10 @@ if (!$serendipity['wysiwyg']) {
 <?php
     if ($serendipity['wysiwyg']) {
         $fields = array(
-            'body'      => 'serendipity[body]', 
+            'body'      => 'serendipity[body]',
             'extended'  => 'serendipity[extended]'
         );
-        
+
         foreach($fields AS $f_jsname => $f_item) {
             serendipity_emit_htmlarea_code($f_item, $f_jsname);
         }

diff --git a/lang/UTF-8/serendipity_lang_tr.inc.php b/lang/UTF-8/serendipity_lang_tr.inc.php
index c77c9a224756b5afef6a4ce079172b1562bc1ba3..22940aef950dabbba404d9452c1e94d4b2ad4a4f 100644 (file)
--- a/lang/UTF-8/serendipity_lang_tr.inc.php
+++ b/lang/UTF-8/serendipity_lang_tr.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_en.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_en.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 #Translated to Turkish 2006-03-03 Ahmet USAL - ahmetusal@gmail.com - /*http://www.edirnekizilay.org*/

diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php
index c77c9a224756b5afef6a4ce079172b1562bc1ba3..22940aef950dabbba404d9452c1e94d4b2ad4a4f 100644 (file)
--- a/lang/serendipity_lang_tr.inc.php
+++ b/lang/serendipity_lang_tr.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_en.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_en.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 #Translated to Turkish 2006-03-03 Ahmet USAL - ahmetusal@gmail.com - /*http://www.edirnekizilay.org*/