Changeset 3024 for plugins/tinyMce/admin/page.php

Timestamp:

04/17/11 15:58:45 (12 years ago)

Author:

Moe

Message:

TinyMCE 0.2.6: Dotclear 2.2 compatibility on pages

File:

• plugins/tinyMce/admin/page.php (modified) (3 diffs)

plugins/tinyMce/admin/page.php

@@ -1 +1 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
+# -- BEGIN LICENSE BLOCK ---------------------------------------
 #
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2009 Olivier Meunier and contributors
+# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 #
-# -- END LICENSE BLOCK ------------------------------------
+# -- END LICENSE BLOCK -----------------------------------------
+
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 dcPage::check('pages,contentadmin');
@@ -38 +39 @@
 
 $can_view_page = true;
-$can_edit_page = $core->auth->check('page,usage',$core->blog->id);
-$can_publish = $core->auth->check('page,publish,contentadmin',$core->blog->id);
+$can_edit_page = $core->auth->check('pages,usage',$core->blog->id);
+$can_publish = $core->auth->check('pages,publish,contentadmin',$core->blog->id);
 $can_delete = false;
 
@@ -176 +177 @@
      
      # Magic tweak :)
-     $core->blog->settings->setNameSpace('pages');
-     
-     $core->blog->settings->post_url_format = $page_url_format;
-     $core->blog->settings->setNameSpace('system');
+     $core->blog->settings->system->post_url_format = $page_url_format;
      
      $cur->post_type = 'page';