insert new link class for media manager links

diff --git a/deployment/serendipity_editor.js b/deployment/serendipity_editor.js
index 30a0d21da1226c70a02d295a361bfa81482ec45e..c7549711ca99fc2410c4b8a7254e9b3a9af69071 100644 (file)
--- 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 = "<a href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
+        insert = "<a class='serendipity_image_link' href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
     } else {
         insert = img;
     }

diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 1d15f8c9f970ddc17522c67ecf475cbfda5407cf..e3088d2136ce0edd9e03668ea881a9c965918349 100644 (file)
--- 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 '<div class="serendipityAdminMsgError">'. sprintf(CATEGORY_ALREADY_EXIST, htmlspecialchars($name)) .'</div>';
-            } 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 '<div class="serendipityAdminMsgError">'. PERM_DENIED .'</div>';
             } else {
                 /* Check to make sure parent is not a child of self */

diff --git a/serendipity_editor.js b/serendipity_editor.js
index 30a0d21da1226c70a02d295a361bfa81482ec45e..c7549711ca99fc2410c4b8a7254e9b3a9af69071 100644 (file)
--- 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 = "<a href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
+        insert = "<a class='serendipity_image_link' href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
     } else {
         insert = img;
     }