Changeset 931

Timestamp:

03/22/07 13:20:00 (2 years ago)

Author:

donncha

Message:

WP Merge to rev 5081

Files:

• trunk/wp-includes/l10n.php (modified) (1 diff)
• trunk/wp-includes/link-template.php (modified) (1 diff)
• trunk/xmlrpc.php (modified) (4 diffs)

trunk/wp-includes/l10n.php

@@ -36 +36 @@
-        else
-                echo $text;
+}
+
+function _c($text, $domain = 'default') {
+        global $l10n;
+
+        if ( isset($l10n[$domain]) )
+                $whole = apply_filters('gettext', $l10n[$domain]->translate($text), $text);
+        else
+                $whole = $text;
+
+        $trans = explode('|', $whole, 2); 
+        if ( isset( $trans[1] ) )
+                return $trans[1];
+        else
+                return $trans[0];       
-}
-

trunk/wp-includes/link-template.php

@@ -118 +118 @@
-        global $post;
-
+        $id = (int) $id;
-        if ( !$id )
-                $id = $post->ID;

trunk/xmlrpc.php

@@ -857 +857 @@
-          extract($actual_post);
-
+          if ( ('publish' == $post_status) && !current_user_can('publish_posts') )
+                return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+
-          $post_title = xmlrpc_getposttitle($content);
-          $post_category = xmlrpc_getpostcategory($content);
@@ -1083 +1086 @@
-
-          set_current_user(0, $user_login);
-          if ( !current_user_can('edit_post', $post_ID) )
-            return new IXR_Error(401, 'Sorry, you can not edit this post.');
-
-          $postdata = wp_get_single_post($post_ID, ARRAY_A);
-          extract($postdata);
-                $this->escape($postdata);
-
-                // The post_type defaults to post, but could also be page.
@@ -1098 +1095 @@
-                        $post_type = "page";
-                }
+
+          // Edit page caps are checked in editPage.  Just check post here.
+          if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
+            return new IXR_Error(401, 'Sorry, you can not edit this post.');
+
+          $postdata = wp_get_single_post($post_ID, ARRAY_A);
+          extract($postdata);
+                $this->escape($postdata);
-
-                // Let WordPress manage slug if none was provided.
@@ -1169 +1174 @@
-          $post_more = $content_struct['mt_text_more'];
-          $post_status = $publish ? 'publish' : 'draft';
+
+          if ( ('publish' == $post_status) ) {
+                if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
+                        return new IXR_Error(401, 'Sorry, you do not have the right to publish this page.');
+                else if ( !current_user_can('publish_posts') )
+                        return new IXR_Error(401, 'Sorry, you do not have the right to publish this post.');
+          }
-
-          if ($post_more) {