From f58cd3de78433d9054767731fb04dafe55deaa8e Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Sat, 2 Sep 2006 22:08:10 +0000 Subject: [PATCH] Revert accidental commit. git-svn-id: https://develop.svn.wordpress.org/trunk@4163 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/admin-ajax.php | 13 +++++++------ wp-admin/cat-js.php | 33 +++++++++++++++++++++++++++------ wp-admin/custom-fields.js | 8 ++++---- wp-includes/script-loader.php | 4 +--- 4 files changed, 39 insertions(+), 19 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 0536f44336..0beb5bca0a 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -5,6 +5,7 @@ require_once('admin-db.php'); define('DOING_AJAX', true); + check_ajax_referer(); if ( !is_user_logged_in() ) die('-1'); @@ -16,7 +17,7 @@ function wp_ajax_echo_meta( $pid, $mid, $key, $value ) { $value = wp_specialchars($value, true); $key_js = addslashes(wp_specialchars($key, 'double')); $key = wp_specialchars($key, true); - $r = "$mid$pid$mid$pid"; $r .= ""; $r .= ""; $r .= ""; @@ -24,7 +25,7 @@ function wp_ajax_echo_meta( $pid, $mid, $key, $value ) { $r .= ""; - $r .= "]]>"; + $r .= "]]>"; return $r; } @@ -147,9 +148,9 @@ case 'add-cat' : // From Manage->Categories $cat_full_name = wp_specialchars( $cat_full_name, 1 ); $r = ""; - $r .= "$cat->cat_ID$cat_full_name$cat->cat_ID$cat_full_name"; $r .= _cat_row( $cat, $level, $cat_full_name ); - $r .= "]]>"; + $r .= "]]>"; header('Content-type: text/xml'); die($r); break; @@ -206,9 +207,9 @@ case 'add-user' : } elseif ( !$user_id ) { die('0'); } - $r = "$user_id$user_id"; $r .= user_row( $user_id ); - $r .= "]]>"; + $r .= "]]>"; header('Content-type: text/xml'); die($r); break; diff --git a/wp-admin/cat-js.php b/wp-admin/cat-js.php index 2eb6001fb8..c286168c72 100644 --- a/wp-admin/cat-js.php +++ b/wp-admin/cat-js.php @@ -5,10 +5,31 @@ cache_javascript_headers(); addLoadEvent(function(){catList=new listMan('categorychecklist');catList.ajaxRespEl='jaxcat';catList.topAdder=1;catList.alt=0;catList.showLink=0;}); addLoadEvent(newCatAddIn); function newCatAddIn() { - var jaxcat = $('jaxcat'); - if ( !jaxcat ) - return false; - jaxcat.update(''); - $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); }; - $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); }; + if ( !document.getElementById('jaxcat') ) return false; + var ajaxcat = document.createElement('span'); + ajaxcat.id = 'ajaxcat'; + + newcat = document.createElement('input'); + newcat.type = 'text'; + newcat.name = 'newcat'; + newcat.id = 'newcat'; + newcat.size = '16'; + newcat.setAttribute('autocomplete', 'off'); + newcat.onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','categorydiv');", e); }; + + var newcatSub = document.createElement('input'); + newcatSub.type = 'button'; + newcatSub.name = 'Button'; + newcatSub.id = 'catadd'; + newcatSub.value = 'Add'; + newcatSub.onclick = function() { catList.ajaxAdder('category', 'categorydiv'); }; + + ajaxcat.appendChild(newcat); + ajaxcat.appendChild(newcatSub); + document.getElementById('jaxcat').appendChild(ajaxcat); + + howto = document.createElement('span'); + howto.innerHTML = ""; + howto.id = 'howto'; + ajaxcat.appendChild(howto); } diff --git a/wp-admin/custom-fields.js b/wp-admin/custom-fields.js index d463ddcebf..e86c87ebd6 100644 --- a/wp-admin/custom-fields.js +++ b/wp-admin/custom-fields.js @@ -1,8 +1,8 @@ function customFieldsOnComplete() { - var pidEl = $('post_ID'); + var pidEl = document.getElementById('post_ID'); pidEl.name = 'post_ID'; pidEl.value = getNodeValue(theList.ajaxAdd.responseXML, 'postid'); - var aEl = $('hiddenaction') + var aEl = document.getElementById('hiddenaction') if ( aEl.value == 'post' ) aEl.value = 'postajaxpost'; } addLoadEvent(customFieldsAddIn); @@ -21,6 +21,6 @@ function customFieldsAddIn() { } } - $('metakeyinput').onkeypress = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); }; - $('updatemetasub').onclick = function(e) {return killSubmit('theList.inputData+="&id="+$("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); }; + document.getElementById('metakeyinput').onkeypress = function(e) {return killSubmit('theList.inputData+="&id="+document.getElementById("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); }; + document.getElementById('updatemetasub').onclick = function(e) {return killSubmit('theList.inputData+="&id="+document.getElementById("post_ID").value;theList.ajaxAdder("meta", "newmeta");', e); }; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 7ebcdae27c..d5a8986134 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -19,11 +19,9 @@ class WP_Scripts { $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' ); $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0'); $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4107'); - $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), rand()); - $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), rand()); if ( is_admin() ) { $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' ); - $this->add( 'listman-old', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one + $this->add( 'listman', '/wp-admin/list-manipulation-js.php', array('sack', 'fat'), '4042' ); // Make changeset # the correct one $this->add( 'ajaxcat', '/wp-admin/cat-js.php', array('listman'), '3684' ); $this->add( 'admin-categories', '/wp-admin/categories.js', array('listman'), '3684' ); $this->add( 'admin-custom-fields', '/wp-admin/custom-fields.js', array('listman'), '3733' );