Changeset 530

Timestamp:

02/17/06 15:23:24 (3 years ago)

Author:

donncha

Message:

WP Merge
Fix for pages not displaying

Files:

• trunk/wp-inst/wp-admin/admin-functions.php (modified) (7 diffs)
• trunk/wp-inst/wp-admin/admin-header.php (modified) (2 diffs)
• trunk/wp-inst/wp-admin/categories.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/edit-comments.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/edit-pages.php (modified) (2 diffs)
• trunk/wp-inst/wp-admin/inline-uploading.php (modified) (3 diffs)
• trunk/wp-inst/wp-admin/link-import.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/menu-header.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/options-general.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/options-misc.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/options-reading.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/options-writing.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/page-new.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/plugin-editor.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/templates.php (modified) (1 diff)
• trunk/wp-inst/wp-admin/theme-editor.php (modified) (2 diffs)
• trunk/wp-inst/wp-admin/users.php (modified) (1 diff)
• trunk/wp-inst/wp-comments-post.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/comment-functions.php (modified) (1 diff)
• trunk/wp-inst/wp-includes/functions-post.php (modified) (2 diffs)
• trunk/wp-inst/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-inst/wp-includes/template-functions-category.php (modified) (2 diffs)
• trunk/wp-inst/wp-includes/template-functions-links.php (modified) (1 diff)
• trunk/wp-inst/wp-login.php (modified) (1 diff)
• trunk/wp-inst/wp-register.php (modified) (2 diffs)

trunk/wp-inst/wp-admin/admin-functions.php

@@ -611 +611 @@
-                        if ($category->category_parent == $parent) {
-                                $category->cat_name = wp_specialchars($category->cat_name);
-                                //$count = $wpdb->get_var("SELECT COUNT(post_id) FROM $wpdb->post2cat WHERE category_id = $category->cat_ID");
-                                $pad = str_repeat('— ', $level);
-                                if ( current_user_can('manage_categories') ) {
@@ -631 +630 @@
-                                                                <td>$edit</td>
-                                                                </tr>";
-                                                                //<td>$count</td>
-                                cat_rows($category->cat_ID, $level +1, $categories);
-                        }
@@ -1234 +1232 @@
-        global $menu;
-        global $submenu;
+        global $menu_nopriv;
-
-        $parent = get_admin_page_parent();
+        
+        if ( isset($menu_nopriv[$pagenow]) )
+                return false;
+
+        if ( empty($parent) )
+                return true;
+
+        if (isset ($submenu[$parent])) {
+                foreach ($submenu[$parent] as $submenu_array) {
+                        if ($submenu_array[2] == $pagenow) {
+                                if (current_user_can($submenu_array[1]))
+                                        return true;
+                                else
+                                        return false;
+                        }
+                }
+        }
-
-        foreach ($menu as $menu_array) {
-                //echo "parent array: " . $menu_array[2];
-                if ($menu_array[2] == $parent) {
-
+
+
+
-                                return false;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        return true;
-}
@@ -1316 +1319 @@
-        global $pagenow;
-        global $plugin_page;
-
-
+
+
+
+
+
+
-                return $parent_file;
-        }
@@ -1325 +1332 @@
-                        if ($parent_menu[2] == $plugin_page) {
-                                $parent_file = $plugin_page;
-
+
+
+
+
-                        }
-                }
@@ -1332 +1342 @@
-        foreach (array_keys($submenu) as $parent) {
-                foreach ($submenu[$parent] as $submenu_array) {
+                        if ( isset($real_parent_file[$parent]) )
+                                $parent = $real_parent_file[$parent];
-                        if ($submenu_array[2] == $pagenow) {
-                                $parent_file = $parent;
@@ -1366 +1378 @@
-        global $submenu;
-        global $menu;
+        global $real_parent_file;
-
-        $parent = plugin_basename($parent);
+        if ( isset($real_parent_file[$parent]) )
+                $parent = $real_parent_file[$parent];
+
-        $file = plugin_basename($file);
-

trunk/wp-inst/wp-admin/admin-header.php

@@ -1 @@
- 
+
-@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if (!isset($_GET["page"])) require_once('admin.php');
@@ -60 +60 @@
-<body>
-<div id="wphead">
-') ?> &raquo;
+ &raquo;') ?>
-</div>
-<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_settings('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Account'); ?></a>] </p></div>

trunk/wp-inst/wp-admin/categories.php

@@ -93 +93 @@
-                </tr>
-                </table>
-') ?> &raquo;
+ &raquo;') ?>
- </form>
- <p><a href="categories.php"><?php _e('&laquo; Return to category list'); ?></a></p>

trunk/wp-inst/wp-admin/edit-comments.php

@@ -164 +164 @@
-        ?></table>
-    <p><a href="javascript:;" onclick="checkAll(document.getElementById('deletecomments')); return false; "><?php _e('Invert Checkbox Selection') ?></a></p>
-') ?> &raquo;
-') ?> &raquo;
+ &raquo;') ?>
+ &raquo;') ?>
-  </form>
-<?php

trunk/wp-inst/wp-admin/edit-page-form.php

@@ -184 +184 @@
-<?php if ( $post_ID ) : ?>
-<input name="save" type="submit" id="save" tabindex="5" value=" <?php _e('Save and Continue Editing'); ?> "/> 
-') ?> &raquo;
+ &raquo;') ?>
-<?php else : ?>
-') ?> &raquo;
+ &raquo;') ?>
-<?php endif; ?>
-<input name="referredby" type="hidden" id="referredby" value="<?php echo $sendto; ?>" />

trunk/wp-inst/wp-admin/edit-pages.php

@@ -9 +9 @@
-<div class="wrap">
-<h2><?php _e('Page Management'); ?></h2>
-'); ?> &raquo;
+ &raquo;'); ?>
-
-<form name="searchform" action="" method="get"> 
@@ -73 +73 @@
-?> 
-
-'); ?> &raquo;
+ &raquo;'); ?>
-
-</div>

trunk/wp-inst/wp-admin/inline-uploading.php

@@ -238 +238 @@
-                        $ypadding = (96 - $image['uheight']) / 2;
-                        $style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n";
-htmlentitie
+wp_specialchar
-                        $script .= "aa[{$ID}] = '<a id=\"p{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
-ab[{$ID}] = '<a class=\"imagelink\" href=\"{$image['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">';
@@ -258 +258 @@
-";
-                } else {
-htmlentitie
+wp_specialchar
-                        $filename = basename($attachment['guid']);
-                        $icon = get_attachment_icon($ID);
@@ -660 +660 @@
-<?php endif; ?>
-<?php if ( false !== $next ) : ?>
-'); ?> &raquo;
+ &raquo;'); ?>
-<li><a href="<?php echo basename(__FILE__); ?>?action=<?php echo $action; ?>&amp;post=<?php echo $post; ?>&amp;all=<?php echo $all; ?>&amp;last=true" title="<?php _e('Last'); ?>">&raquo;|</a></li>
-<?php else : ?>
-'); ?> &raquo;
+ &raquo;'); ?>
-<li class="inactive">&raquo;|</li>
-<?php endif; ?>

trunk/wp-inst/wp-admin/link-import.php

@@ -55 +55 @@
-</select></p>
-
-') ?> &raquo;
+ &raquo;') ?>
-</form>
-

trunk/wp-inst/wp-admin/menu-header.php

@@ -12 +12 @@
-        if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-    
-
+!empty($submenu[$item[2]]) || 
-                if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
-                        echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";

trunk/wp-inst/wp-admin/menu.php

@@ -59 +59 @@
-$submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
-
+// Loop over submenus and remove pages for which the user does not have privs.
+foreach ($submenu as $parent => $sub) {
+        foreach ($sub as $index => $data) {
+                if ( ! current_user_can($data[1]) ) {
+                        $menu_nopriv[$data[2]] = true;
+                        unset($submenu[$parent][$index]);
+                }
+        }
+        
+        if ( empty($submenu[$parent]) )
+                unset($submenu[$parent]);
+}
+
+// Loop over the top-level menu.
+// Remove menus that have no accessible submenus and require privs that the user does not have.
+// Menus for which the original parent is not acessible due to lack of privs will have the next
+// submenu in line be assigned as the new menu parent. 
+foreach ( $menu as $id => $data ) {
+        // If submenu is empty...
+        if ( empty($submenu[$data[2]]) ) {
+                // And user doesn't have privs, remove menu.
+                if ( ! current_user_can($data[1]) ) {
+                        $menu_nopriv[$data[2]] = true;
+                        unset($menu[$id]);
+                }
+        } else {
+                $subs = $submenu[$data[2]];
+                $first_sub = array_shift($subs);
+                $old_parent = $data[2];
+                $new_parent = $first_sub[2];
+                // If the first submenu is not the same as the assigned parent,
+                // make the first submenu the new parent.
+                if ( $new_parent != $old_parent ) {
+                        $real_parent_file[$old_parent] = $new_parent;
+                        $menu[$id][2] = $new_parent;
+                        
+                        foreach ($submenu[$old_parent] as $index => $data) {
+                                $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+                                unset($submenu[$old_parent][$index]);
+                        }
+                        unset($submenu[$old_parent]);   
+                }
+        }
+}
+
-get_currentuserinfo();
-if( is_site_admin() ) {

trunk/wp-inst/wp-admin/options-general.php

@@ -105 +105 @@
-</fieldset> 
-
-') ?> &raquo;
+ &raquo;') ?>
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="blogname,blogdescription,users_can_register,gmt_offset,date_format,time_format,start_of_week,comment_registration, WPLANG" /> 

trunk/wp-inst/wp-admin/options-misc.php

@@ -45 +45 @@
-<input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" /> 
-') ?> &raquo;
+ &raquo;') ?>
-</p>
-</form> 

trunk/wp-inst/wp-admin/options-reading.php

@@ -53 +53 @@
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression " /> 
-') ?> &raquo;
+ &raquo;') ?>
-</p> 
-</form> 

trunk/wp-inst/wp-admin/options-writing.php

@@ -46 +46 @@
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags" /> 
-') ?> &raquo;
+ &raquo;') ?>
-</p>
-</form> 

trunk/wp-inst/wp-admin/page-new.php

@@ -8 +8 @@
-
-<?php if ( isset($_GET['saved']) ) : ?>
-'); ?> &raquo;
+ &raquo;'); ?>
-<?php endif; ?>
-

trunk/wp-inst/wp-admin/plugin-editor.php

@@ -104 +104 @@
-     <p class="submit">
-<?php
-') . " &raquo;
+ &raquo;') . "
-?>
-</p>

trunk/wp-inst/wp-admin/templates.php

@@ -135 +135 @@
-     <p class="submit">
-<?php
-') . " &raquo;
+ &raquo;') . "
-?>
-</p>

trunk/wp-inst/wp-admin/theme-editor.php

@@ -102 +102 @@
-?>
- </select>
-') ?> &raquo;
+ &raquo;') ?>
- </form>
- </div>
@@ -139 +139 @@
-     <p class="submit">
-<?php
-') . " &raquo;
+ &raquo;') . "
-?>
-</p>

trunk/wp-inst/wp-admin/users.php

@@ -366 +366 @@
-    </table>
-  <p class="submit">
-') ?> &raquo;
+ &raquo;') ?>
-  </p>
-  </form>

trunk/wp-inst/wp-comments-post.php

@@ -54 +54 @@
-        setcookie('comment_author_' . COOKIEHASH, stripslashes($comment_author), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-        setcookie('comment_author_email_' . COOKIEHASH, stripslashes($comment_author_email), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-$comment_author_url
+clean_url($comment_author_url)
-endif;
-

trunk/wp-inst/wp-includes/comment-functions.php

@@ -79 +79 @@
-        if ( ! isset($comment_approved) )
-                $comment_approved = 1;
+        if ( ! isset($user_id) )
+                $user_id = 0;
-
-        $result = $wpdb->query("INSERT INTO $wpdb->comments 

trunk/wp-inst/wp-includes/functions-post.php

@@ -313 +313 @@
-                        post_date_gmt = '$post_date_gmt',
-                        post_content = '$post_content',
+                        post_content_filtered = '$post_content_filtered',
-                        post_title = '$post_title',
-                        post_excerpt = '$post_excerpt',
@@ -333 +334 @@
-                $wpdb->query(
-                        "INSERT INTO $wpdb->posts
-
+content_filtered, post_
-                        VALUES
-
+content_filtered', '$post_
-                        $post_ID = $wpdb->insert_id;
-        }

trunk/wp-inst/wp-includes/functions.php

@@ -682 +682 @@
-                $full_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
-
-
+ AND post_type='page'
-
-        if ( empty($pages) ) 
@@ -691 +691 @@
-                $curpage = $page;
-                while ($curpage->post_parent != 0) {
-
+ and post_type='page'
-                        $path = '/' . $curpage->post_name . $path;
-                }

trunk/wp-inst/wp-includes/template-functions-category.php

@@ -49 +49 @@
-                $thelist .= '<ul class="post-categories">';
-                foreach ( $categories as $category ) {
-                        $category->cat_name = $category->cat_name;
-                        $thelist .= "\n\t<li>";
-                        switch ( strtolower($parents) ) {
@@ -72 +71 @@
-                $i = 0;
-                foreach ( $categories as $category ) {
-                        $category->cat_name = $category->cat_name;
-                        if ( 0 < $i )
-                                $thelist .= $separator . ' ';

trunk/wp-inst/wp-includes/template-functions-links.php

@@ -63 +63 @@
-                $authordata = get_userdata($post->post_author);
-                $author = $authordata->user_nicename;
+                $date = explode(" ",date('Y m d H i s', $unixtime));
-                $rewritereplace = 
-                array(
-date('Y', $unixtime)
-date('m', $unixtime)
-date('d', $unixtime)
-date('H', $unixtime)
-date('i', $unixtime)
-date('s', $unixtime)
+$date[0]
+$date[1]
+$date[2]
+$date[3]
+$date[4]
+$date[5]
-                        $post->post_name,
-                        $post->ID,

trunk/wp-inst/wp-login.php

@@ -74 +74 @@
-<input type="text" name="email" id="email" value="" size="25" tabindex="2" /></label><br />
-</p>
-'); ?> &raquo;
+ &raquo;'); ?>
-</form>
-<ul>

trunk/wp-inst/wp-register.php

@@ -69 +69 @@
-        <?php printf(__('Password: %s'), '<strong>' . __('emailed to you') . '</strong>') ?> <br />
-        <?php printf(__('E-mail: %s'), "<strong>$user_email</strong>") ?></p>
-'); ?> &raquo;
+ &raquo;'); ?>
-</div>
-</body>
@@ -112 +112 @@
-        <p><label for="user_email"><?php _e('E-mail:') ?></label><br /> <input type="text" name="user_email" id="user_email" size="25" maxlength="100" value="<?php echo $user_email; ?>" /></p>
-        <p><?php _e('A password will be emailed to you.') ?></p>
-') ?> &raquo;
+ &raquo;') ?>
-</form>
-<ul>