Changeset 1538:b956d78197c5

Timestamp:

08/23/13 15:33:51 (10 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

2.5

Parents:

1515:03b3235091cf (diff), 1537:a3ac778e9132 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged in lipki/dotclear/ticket #1406-2 (pull request #59) - fixes #1406

Files:

• admin/services.php (modified) (1 diff)
• admin/services.php (modified) (1 diff)

admin/services.php

@@ -238 +238 @@
           }
           
-          $core->media = new dcMedia($core);
-          $file = $core->media->getFile($id);
+          try {
+               $core->media = new dcMedia($core);
+               $file = $core->media->getFile($id);
+          } catch (Exception $e) {}
           
           if ($file === null || $file->type != 'application/zip' || !$file->editable) {

admin/services.php

@@ -141 +141 @@
      public static function quickPost($core,$get,$post)
      {
+          # Create category
+          if (!empty($post['new_cat_title']) && $core->auth->check('categories', $core->blog->id)) {
+          
+               $cur_cat = $core->con->openCursor($core->prefix.'category');
+               $cur_cat->cat_title = $post['new_cat_title'];
+               $cur_cat->cat_url = '';
+               
+               $parent_cat = !empty($post['new_cat_parent']) ? $post['new_cat_parent'] : '';
+               
+               # --BEHAVIOR-- adminBeforeCategoryCreate
+               $core->callBehavior('adminBeforeCategoryCreate', $cur_cat);
+               
+               $post['cat_id'] = $core->blog->addCategory($cur_cat, (integer) $parent_cat);
+               
+               # --BEHAVIOR-- adminAfterCategoryCreate
+               $core->callBehavior('adminAfterCategoryCreate', $cur_cat, $post['cat_id']);
+          }
+          
           $cur = $core->con->openCursor($core->prefix.'post');