From a0e730dcdfa87af34fb274e4746240feebe9bf80 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Tue, 14 Feb 2006 09:16:30 +0000 Subject: [PATCH] insert new link class for media manager links --- deployment/serendipity_editor.js | 2 +- include/admin/category.inc.php | 8 +------- serendipity_editor.js | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/deployment/serendipity_editor.js b/deployment/serendipity_editor.js index 30a0d21..c754971 100644 --- a/deployment/serendipity_editor.js +++ b/deployment/serendipity_editor.js @@ -217,7 +217,7 @@ function serendipity_imageSelector_done(textarea) } if (f['serendipity[isLink]'][1].checked == true) { - insert = "" + img + ""; + insert = "" + img + ""; } else { insert = img; } diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php index 1d15f8c..e3088d2 100644 --- a/include/admin/category.inc.php +++ b/include/admin/category.inc.php @@ -51,13 +51,7 @@ if (isset($_POST['SAVE']) && serendipity_checkFormToken()) { } elseif ($serendipity['GET']['adminAction'] == 'edit') { - /* Check to see if a category with the same name, already exist */ - $sql = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}category - WHERE category_name = '". serendipity_db_escape_string($name) ."' - AND categoryid <> ". (int)$serendipity['GET']['cid'], true); - if ( $sql ) { - echo '
'. sprintf(CATEGORY_ALREADY_EXIST, htmlspecialchars($name)) .'
'; - } else if (!serendipity_checkPermission('adminCategoriesMaintainOthers') && !serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write')) { + if (!serendipity_checkPermission('adminCategoriesMaintainOthers') && !serendipity_ACLCheck($serendipity['authorid'], $serendipity['GET']['cid'], 'category', 'write')) { echo '
'. PERM_DENIED .'
'; } else { /* Check to make sure parent is not a child of self */ diff --git a/serendipity_editor.js b/serendipity_editor.js index 30a0d21..c754971 100644 --- a/serendipity_editor.js +++ b/serendipity_editor.js @@ -217,7 +217,7 @@ function serendipity_imageSelector_done(textarea) } if (f['serendipity[isLink]'][1].checked == true) { - insert = "" + img + ""; + insert = "" + img + ""; } else { insert = img; } -- 2.39.5