summaryrefslogtreecommitdiffstats
path: root/wp-admin
diff options
context:
space:
mode:
Diffstat (limited to 'wp-admin')
-rw-r--r--wp-admin/admin-ajax.php105
-rw-r--r--wp-admin/cat-js.php33
-rw-r--r--wp-admin/categories.js6
-rw-r--r--wp-admin/custom-fields.js12
-rw-r--r--wp-admin/list-manipulation-js.php170
-rw-r--r--wp-admin/users.php4
6 files changed, 68 insertions, 262 deletions
diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 8e8be54..4e27900 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -5,7 +5,6 @@ require_once('admin-db.php');
define('DOING_AJAX', true);
-
check_ajax_referer();
if ( !is_user_logged_in() )
die('-1');
@@ -13,19 +12,17 @@ if ( !is_user_logged_in() )
function get_out_now() { exit; }
add_action( 'shutdown', 'get_out_now', -1 );
-function wp_ajax_echo_meta( $pid, $mid, $key, $value ) {
+function wp_ajax_meta_row( $pid, $mid, $key, $value ) {
$value = wp_specialchars($value, true);
$key_js = addslashes(wp_specialchars($key, 'double'));
$key = wp_specialchars($key, true);
- $r = "<meta><id>$mid</id><postid>$pid</postid><newitem><![CDATA[<table><tbody>";
$r .= "<tr id='meta-$mid'><td valign='top'>";
$r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
$r .= "</td><td><textarea name='meta[$mid][value]' tabindex='6' rows='2' cols='30'>$value</textarea></td><td align='center'>";
$r .= "<input name='updatemeta' type='button' class='updatemeta' tabindex='6' value='Update' onclick='return theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);' /><br />";
$r .= "<input name='deletemeta[$mid]' type='submit' onclick=\"return deleteSomething( 'meta', $mid, '";
$r .= sprintf(__("You are about to delete the &quot;%s&quot; custom field on this post.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), $key_js);
- $r .= "' );\" class='deletemeta' tabindex='6' value='Delete' />";
- $r .= "</td></tr></tbody></table>]]></newitem></meta>";
+ $r .= "' );\" class='deletemeta' tabindex='6' value='Delete' /></td></tr>";
return $r;
}
@@ -113,7 +110,7 @@ case 'add-category' : // On the Fly
if ( !current_user_can( 'manage_categories' ) )
die('-1');
$names = explode(',', $_POST['newcat']);
- $r = "<?xml version='1.0' standalone='yes'?><ajaxresponse>";
+ $x = new WP_Ajax_Response();
foreach ( $names as $cat_name ) {
$cat_name = trim($cat_name);
if ( !$category_nicename = sanitize_title($cat_name) )
@@ -121,14 +118,13 @@ case 'add-category' : // On the Fly
if ( !$cat_id = category_exists( $cat_name ) )
$cat_id = wp_create_category( $cat_name );
$cat_name = wp_specialchars(stripslashes($cat_name));
- $r .= "<category><id>$cat_id</id><newitem><![CDATA[";
- $r .= "<li id='category-$cat_id'><label for='in-category-$cat_id' class='selectit'>";
- $r .= "<input value='$cat_id' type='checkbox' checked='checked' name='post_category[]' id='in-category-$cat_id'/> $cat_name</label></li>";
- $r .= "]]></newitem></category>";
+ $x->add( array(
+ 'what' => 'category',
+ 'id' => $cat_id,
+ 'data' => "<li id='category-$cat_id'><label for='in-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='post_category[]' id='in-category-$cat_id'/> $cat_name</label></li>"
+ ) );
}
- $r .= '</ajaxresponse>';
- header('Content-type: text/xml');
- die($r);
+ $x->send();
break;
case 'add-cat' : // From Manage->Categories
if ( !current_user_can( 'manage_categories' ) )
@@ -147,38 +143,38 @@ case 'add-cat' : // From Manage->Categories
}
$cat_full_name = wp_specialchars( $cat_full_name, 1 );
- $r = "<?xml version='1.0' standalone='yes'?><ajaxresponse>";
- $r .= "<cat><id>$cat->cat_ID</id><name>$cat_full_name</name><newitem><![CDATA[<table><tbody>";
- $r .= _cat_row( $cat, $level, $cat_full_name );
- $r .= "</tbody></table>]]></newitem></cat></ajaxresponse>";
- header('Content-type: text/xml');
- die($r);
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'cat',
+ 'id' => $cat->cat_ID,
+ 'data' => _cat_row( $cat, $level, $cat_full_name ),
+ 'supplemental' => array('name' => $cat_full_name)
+ ) );
+ $x->send();
break;
case 'add-meta' :
if ( !current_user_can( 'edit_post', $id ) )
die('-1');
if ( $id < 0 ) {
- if ( $pid = write_post() )
- $meta = has_meta( $pid );
+ if ( $pid = wp_insert_post() )
+ $mid = add_meta( $pid );
else
die('0');
- $key = $meta[0]['meta_key'];
- $value = $meta[0]['meta_value'];
- $mid = (int) $meta[0]['meta_id'];
- } else {
- if ( $mid = add_meta( $id ) )
- $meta = get_post_meta_by_id( $mid );
- else
- die('0');
- $key = $meta->meta_key;
- $value = $meta->meta_value;
- $pid = (int) $meta->post_id;
+ } else if ( !$mid = add_meta( $id ) ) {
+ die('0');
}
- $r = "<?xml version='1.0' standalone='yes'?><ajaxresponse>";
- $r .= wp_ajax_echo_meta( $pid, $mid, $key, $value );
- $r .= '</ajaxresponse>';
- header('Content-type: text/xml');
- die($r);
+
+ $meta = get_post_meta_by_id( $mid );
+ $key = $meta->meta_key;
+ $value = $meta->meta_value;
+ $pid = (int) $meta->post_id;
+
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'meta',
+ 'id' => $mid,
+ 'data' => wp_ajax_meta_row( $pid, $mid, $key, $value ),
+ 'supplemental' => array('postid' => $pid)
+ ) );
+ $x->send();
break;
case 'update-meta' :
$mid = (int) array_pop(array_keys($_POST['meta']));
@@ -188,33 +184,36 @@ case 'update-meta' :
die('0');
if ( !current_user_can( 'edit_post', $meta->post_id ) )
die('-1');
- $r = "<?xml version='1.0' standalone='yes'?><ajaxresponse>";
if ( $u = update_meta( $mid, $key, $value ) ) {
$key = stripslashes($key);
$value = stripslashes($value);
- $r .= wp_ajax_echo_meta( $meta->post_id, $mid, $key, $value );
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'meta',
+ 'id' => $mid,
+ 'data' => wp_ajax_meta_row( $meta->post_id, $mid, $key, $value ),
+ 'supplemental' => array('postid' => $meta->post_id)
+ ) );
+ $x->send();
}
- $r .= '</ajaxresponse>';
- header('Content-type: text/xml');
- die($r);
+ die('0');
break;
case 'add-user' :
if ( !current_user_can('edit_users') )
die('-1');
require_once(ABSPATH . WPINC . '/registration.php');
- $user_id = add_user();
- if ( is_wp_error( $user_id ) ) {
- foreach( $user_id->get_error_messages() as $message )
- echo "$message<br />";
- exit;
- } elseif ( !$user_id ) {
+ if ( !$user_id = add_user() )
die('0');
+ elseif ( is_wp_error( $user_id ) ) {
+ foreach( $user_id->get_error_messages() as $message )
+ echo "<p>$message<p>";
+ exit;
}
- $r = "<?xml version='1.0' standalone='yes'?><ajaxresponse><user><id>$user_id</id><newitem><![CDATA[<table><tbody>";
- $r .= user_row( $user_id );
- $r .= "</tbody></table>]]></newitem></user></ajaxresponse>";
- header('Content-type: text/xml');
- die($r);
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'user',
+ 'id' => $user_id,
+ 'data' => user_row( $user_id )
+ ) );
+ $x->send();
break;
case 'autosave' :
$_POST['post_content'] = $_POST['content'];
diff --git a/wp-admin/cat-js.php b/wp-admin/cat-js.php
index 77305ac..e1b0e28 100644
--- a/wp-admin/cat-js.php
+++ b/wp-admin/cat-js.php
@@ -5,31 +5,10 @@ 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() {
- 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 = '<?php _e('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 = "<?php _e('Separate multiple categories with commas.'); ?>";
- howto.id = 'howto';
- ajaxcat.appendChild(howto);
+ var jaxcat = $('jaxcat');
+ if ( !jaxcat )
+ return false;
+ jaxcat.update('<span id="ajaxcat"><input type="text" name="newcat" id="newcat" size="16" autocomplete="off"/><input type="button" name="Button" id="catadd" value="<?php _e('Add'); ?>"/><span id="howto"><?php _e('Separate multiple categories with commas.'); ?></span></span>');
+ $('newcat').onkeypress = function(e) { return killSubmit("catList.ajaxAdder('category','jaxcat');", e); };
+ $('catadd').onclick = function() { catList.ajaxAdder('category', 'jaxcat'); };
}
diff --git a/wp-admin/categories.js b/wp-admin/categories.js
index a636961..8951df0 100644
--- a/wp-admin/categories.js
+++ b/wp-admin/categories.js
@@ -1,9 +1,9 @@
addLoadEvent(function() {
if (!theList.theList) return false;
document.forms.addcat.submit.onclick = function(e) {return killSubmit('theList.ajaxAdder("cat", "addcat");', e); };
- theList.addComplete = function(what, where, update) {
- var name = getNodeValue(theList.ajaxAdd.responseXML, 'name');
- var id = getNodeValue(theList.ajaxAdd.responseXML, 'id');
+ theList.addComplete = function(what, where, update, transport) {
+ var name = getNodeValue(transport.responseXML, 'name');
+ var id = transport.responseXML.getElementsByTagName(what)[0].getAttribute('id');
var options = document.forms['addcat'].category_parent.options;
options[options.length] = new Option(name, id);
};
diff --git a/wp-admin/custom-fields.js b/wp-admin/custom-fields.js
index e86c87e..a48661f 100644
--- a/wp-admin/custom-fields.js
+++ b/wp-admin/custom-fields.js
@@ -1,8 +1,8 @@
-function customFieldsOnComplete() {
- var pidEl = document.getElementById('post_ID');
+function customFieldsOnComplete( what, where, update, transport ) {
+ var pidEl = $('post_ID');
pidEl.name = 'post_ID';
- pidEl.value = getNodeValue(theList.ajaxAdd.responseXML, 'postid');
- var aEl = document.getElementById('hiddenaction')
+ pidEl.value = getNodeValue(transport.responseXML, 'postid');
+ var aEl = $('hiddenaction')
if ( aEl.value == 'post' ) aEl.value = 'postajaxpost';
}
addLoadEvent(customFieldsAddIn);
@@ -21,6 +21,6 @@ function customFieldsAddIn() {
}
}
- 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); };
+ $('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); };
}
diff --git a/wp-admin/list-manipulation-js.php b/wp-admin/list-manipulation-js.php
deleted file mode 100644
index 288ec1e..0000000
--- a/wp-admin/list-manipulation-js.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-require_once('admin.php');
-cache_javascript_headers();
-$handler = get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php';
-?>
-addLoadEvent(function(){theList=new listMan();});
-function deleteSomething(what,id,message,obj){if(!obj)obj=theList;if(!message)message="<?php printf(__('Are you sure you want to delete this %s?'),"'+what+'"); ?>";if(confirm(message))return obj.ajaxDelete(what,id);else return false;}
-function dimSomething(what,id,dimClass,obj){if(!obj)obj=theList;return obj.ajaxDimmer(what,id,dimClass);}
-
-function WPAjax(file, responseEl){//class WPAjax extends sack
- this.getResponseElement=function(r){var p=document.getElementById(r+'-p');if(!p){p=document.createElement('span');p.id=r+'-p';document.getElementById(r).appendChild(p);}this.myResponseElement=p; }
- this.parseAjaxResponse=function(){
- if(isNaN(this.response)){this.myResponseElement.innerHTML='<div class="error"><p>'+this.response+'</p></div>';return false;}
- this.response=parseInt(this.response,10);
- if(-1==this.response){this.myResponseElement.innerHTML="<div class='error'><p><?php _e("You don't have permission to do that."); ?></p></div>";return false;}
- else if(0==this.response){this.myResponseElement.innerHTML="<div class='error'><p><?php _e("Something odd happened. Try refreshing the page? Either that or what you tried to change never existed in the first place."); ?></p></div>";return false;}
- return true;
- }
- this.parseAjaxResponseXML=function(){
- if(this.responseXML&&typeof this.responseXML=='object')return true;
- if(isNaN(this.response)){this.myResponseElement.innerHTML='<div class="error"><p>'+this.response+'</p></div>';return false;}
- var r=parseInt(this.response,10);
- if(-1==r){this.myResponseElement.innerHTML="<div class='error'><p><?php _e("You don't have permission to do that."); ?></p></div>";}
- else if(0==r){this.myResponseElement.innerHTML="<div class='error'><p><?php _e("Invalid Entry."); ?></p></div>";}
- return false;
- }
- this.init(file,responseEl);
-} WPAjax.prototype=new sack;
- WPAjax.prototype.init=function(f,r){
- this.encVar('cookie', document.cookie);
- this.requestFile=f?f:'<?php echo $handler; ?>';this.getResponseElement(r);this.method='POST';
- }
-
-function listMan(theListId){
- this.theList=null;this.theListId=theListId;
- this.ajaxRespEl=null;this.ajaxHandler='<?php echo $handler; ?>';
- this.inputData='';this.clearInputs=new Array();this.showLink=1;
- this.topAdder=0;this.alt='alternate';this.recolorPos;this.reg_color='#FFFFFF';this.alt_color='#F1F1F1';
- this.addComplete=null;this.delComplete=null;this.dimComplete=null;
- var listType;var listItems;
- self.aTrap=0;
-
- this.ajaxAdder=function(what,where,update){//for TR, server must wrap TR in TABLE TBODY. this.makeEl cleans it
- if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
- this.ajaxAdd=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
- if(this.ajaxAdd.failed)return true;
- this.grabInputs(where);
- var tempObj=this;
- this.ajaxAdd.onCompletion=function(){
- if(!this.parseAjaxResponseXML())return;
- var newItems=this.responseXML.getElementsByTagName(what);
- if(tempObj.topAdder)tempObj.recolorPos=0;
- if(newItems){for (c=0;c<newItems.length;c++){
- var id=getNodeValue(newItems[c],'id');
- var exists=document.getElementById(what+'-'+id);
- if(exists)tempObj.replaceListItem(exists.id,getNodeValue(newItems[c],'newitem'),newItems.length,update);
- else tempObj.addListItem(getNodeValue(newItems[c],'newitem'),newItems.length);
- }}
- tempObj.inputData='';
- if(tempObj.showLink){this.myResponseElement.innerHTML='<div id="jumplink" class="updated fade"><p><a href="#'+what+'-'+id+'"><?php _e('Jump to new item'); ?></a></p></div>';}
- else this.myResponseElement.innerHTML='';
- for(var i=0;i<tempObj.clearInputs.length;i++){try{var theI=document.getElementById(tempObj.clearInputs[i]);if(theI.tagName.match(/select/i))theI.selectedIndex=0;else theI.value='';}catch(e){}}
- if(tempObj.addComplete&&typeof tempObj.addComplete=='function')tempObj.addComplete(what,where,update);
- tempObj.recolorList(tempObj.recolorPos,1000);
- }
- this.ajaxAdd.runAJAX('action='+(update?'update-':'add-')+what+this.inputData);
- return false;
- }
- this.ajaxUpdater=function(what,where){return this.ajaxAdder(what,where,true);}
- this.ajaxDelete=function(what,id){
- if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
- this.ajaxDel=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
- if(this.ajaxDel.failed)return true;
- var tempObj=this;
- this.ajaxDel.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.removeListItem(what.replace('-as-spam','')+'-'+id);this.myResponseElement.innerHTML='';if(tempObj.delComplete&&typeof tempObj.delComplete=='function')tempObj.delComplete(what,id);tempObj.recolorList(tempObj.recolorPos,1000)}};
- this.ajaxDel.runAJAX('action=delete-'+what+'&id='+id);
- return false;
- }
- this.ajaxDimmer=function(what,id,dimClass){
- if(self.aTrap)return;self.aTrap=1;setTimeout('aTrap=0',300);
- this.ajaxDim=new WPAjax(this.ajaxHandler,this.ajaxRespEl?this.ajaxRespEl:'ajax-response');
- if(this.ajaxDim.failed)return true;
- var tempObj=this;
- this.ajaxDim.onCompletion=function(){if(this.parseAjaxResponse()){tempObj.dimItem(what+'-'+id,dimClass);this.myResponseElement.innerHTML='';if(tempObj.dimComplete&&typeof tempObj.dimComplete=='function')tempObj.dimComplete(what,id,dimClass);}};
- this.ajaxDim.runAJAX('action=dim-'+what+'&id='+id);
- return false;
- }
- this.makeEl=function(h){var fakeItem=document.createElement('div');fakeItem.innerHTML=h;var r=fakeItem.firstChild;while(r.tagName.match(/(table|tbody)/i)){r=r.firstChild;}return r;}
- this.addListItem=function(h,tot){
- newItem=this.makeEl(h);
- if(this.topAdder){var firstItem=this.theList.getElementsByTagName('table'==listType?'tr':'li')[0];listItems.unshift(newItem.id);this.recolorPos++}
- else{listItems.push(newItem.id);this.recolorPos=listItems.length;}
- if(this.alt&&!((tot-this.recolorPos)%2))newItem.className+=' '+this.alt;
- if(firstItem)firstItem.parentNode.insertBefore(newItem,firstItem);
- else this.theList.appendChild(newItem);
- Fat.fade_element(newItem.id);
- }
- this.removeListItem=function(id,noFade){
- if(!noFade)Fat.fade_element(id,null,700,'#FF3333');
- var theItem=document.getElementById(id);
- if(!noFade){var func=encloseFunc(function(a){a.parentNode.removeChild(a);},theItem);setTimeout(func,705);}
- else{theItem.parentNode.removeChild(theItem);}
- var pos=this.getListPos(id);
- listItems.splice(pos,1);
- }
- this.replaceListItem=function(id,h,tot,update){
- if(!update){this.removeListItem(id,true);this.addListItem(h,tot);return;}
- var newItem=this.makeEl(h);
- var oldItem=document.getElementById(id);
- var pos=this.getListPos(oldItem.id,1);if(this.alt&&!(pos%2))newItem.className+=' '+this.alt;
- oldItem.parentNode.replaceChild(newItem,oldItem);
- Fat.fade_element(newItem.id);
- }
- this.dimItem=function(id,dimClass,noFade){
- var theItem=document.getElementById(id);
- if(theItem.className.match(dimClass)){if(!noFade)Fat.fade_element(id,null,700,null);theItem.className=theItem.className.replace(dimClass,'');}
- else{if(!noFade)Fat.fade_element(id,null,700,'#FF3333');theItem.className=theItem.className+' '+dimClass;}
- }
- this.grabInputs=function(elId){//text,password,hidden,textarea,select
- var theItem=document.getElementById(elId);
- var inputs=new Array();
- inputs.push(theItem.getElementsByTagName('input'),theItem.getElementsByTagName('textarea'),theItem.getElementsByTagName('select'));
- for(var a=0;a<inputs.length;a++){
- for(var i=0;i<inputs[a].length;i++){
- if('action'==inputs[a][i].name)continue;
- if('text'==inputs[a][i].type||'password'==inputs[a][i].type||'hidden'==inputs[a][i].type||inputs[a][i].tagName.match(/textarea/i)){
- this.inputData+='&'+inputs[a][i].name+'='+encodeURIComponent(inputs[a][i].value);if('hidden'!=inputs[a][i].type)this.clearInputs.push(inputs[a][i].id);
- }else if(inputs[a][i].tagName.match(/select/i)){
- this.inputData+='&'+inputs[a][i].name+'='+encodeURIComponent(inputs[a][i].options[inputs[a][i].selectedIndex].value);this.clearInputs.push(inputs[a][i].id);
- }
- }
- }
- }
- this.getListPos=function(id,n){for(var i=0;i<listItems.length;i++){if(id==listItems[i]){var pos=i;break;}}if(!n){if(pos<this.recolorPos)this.recolorPos=pos;}return pos;}
- this.getListItems=function(){
- if(this.theList)return;
- listItems=new Array();
- if(this.theListId){this.theList=document.getElementById(this.theListId);if(!this.theList)return false;}
- else{this.theList=document.getElementById('the-list');if(this.theList)this.theListId='the-list';}
- if(this.theList){
- var items=this.theList.getElementsByTagName('tr');listType='table';
- if(!items[0]){items=this.theList.getElementsByTagName('li');listType='list';}
- for(var i=0;i<items.length;i++){listItems.push(items[i].id);}
- this.recolorPos=listItems.length;
- }
- }
- this.recolorList=function(pos,dur){
- if(!this.alt)return;if(!pos)pos=0;this.recolorPos=listItems.length;
- for(var i=pos;i<listItems.length;i++){var e=document.getElementById(listItems[i]);if(i%2)e.className=e.className.replace(this.alt,'fade-'+this.alt_color.slice(1));else e.className+=' '+this.alt+' fade-'+this.reg_color.slice(1);e.style.backgroundColor='';}
- Fat.fade_all(dur);
- var func=encloseFunc(function(l){for(var i=0;i<l.length;i++){var e=document.getElementById(l[i]);e.className=e.className.replace(/fade-[a-f0-9]{6}/i,'');}},listItems);
- setTimeout(func,dur+5);
- }
- this.getListItems();
-}
-//No submit unless code returns true.
-function killSubmit ( code, e ) {
- e = e ? e : window.event;
- if ( !e ) return;
- var t = e.target ? e.target : e.srcElement;
- if ( ( 'text' == t.type && e.keyCode == 13 ) || ( 'submit' == t.type && 'click' == e.type ) ) {
- if ( ( 'string' == typeof code && !eval(code) ) || 'function' == typeof code && !code() ) {
- if ( !eval(code) ) { e.returnValue = false; e.cancelBubble = true; return false; }
- }
- }
-}
-//Pretty func adapted from ALA http://www.alistapart.com/articles/gettingstartedwithajax
-function getNodeValue(tree,el){try { var r = tree.getElementsByTagName(el)[0].firstChild.nodeValue; } catch(err) { var r = null; } return r; }
-//Generic but lame JS closure
-function encloseFunc(f){var a=arguments[1];return function(){return f(a);}}
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 43f9d71..e566bc9 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -586,12 +586,10 @@ foreach ( (array) $roleclass as $user_object ) {
<?php if ( is_wp_error( $add_user_errors ) ) : ?>
<div class="error">
- <ul>
<?php
foreach ( $add_user_errors->get_error_messages() as $message )
- echo "$message<br />";
+ echo "<p>$message<p>";
?>
- </ul>
</div>
<?php endif; ?>
<div id="ajax-response"></div>