Changeset 1261

Timestamp:

04/24/08 14:40:09 (3 months ago)

Author:

donncha

Message:

Remove paragraph tag from wp_die() calls, fixes #605, props momo360modena

Files:

• trunk/wp-admin/wpmu-blogs.php (modified) (1 diff)
• trunk/wp-admin/wpmu-edit.php (modified) (7 diffs)
• trunk/wp-admin/wpmu-options.php (modified) (1 diff)
• trunk/wp-admin/wpmu-themes.php (modified) (1 diff)
• trunk/wp-admin/wpmu-upgrade-site.php (modified) (1 diff)

trunk/wp-admin/wpmu-blogs.php

@@ -9 +9 @@
-require_once('admin-header.php');
-if( is_site_admin() == false ) {
-<p>You do not have permission to access this page.</p>
+You do not have permission to access this page.
-}
-$id = intval( $_GET['id'] );

trunk/wp-admin/wpmu-edit.php

@@ -2 +2 @@
-require_once('admin.php');
-if( is_site_admin() == false ) {
-<p>You do not have permission to access this page.</p>
+You do not have permission to access this page.
-}
-
@@ -93 +93 @@
-                
-                if ( empty($domain) || empty($email))
-"<p>Missing blog address or email address.</p>"
+'Missing blog address or email address.'
-                if( !is_email( $email ) ) 
-"<p>Invalid email address</p>"
-
- "VHOST" 
+'Invalid email address'
+
+'VHOST'
-                        $newdomain = $domain.".".$current_site->domain;
-                        $path = $base;
@@ -110 +110 @@
-                        $user_id = wpmu_create_user( $domain, $password, $email );
-                        if(false == $user_id) {
-"<p>There was an error creating the user</p>"
+'There was an error creating the user'
-                        } else {
-                                wp_new_user_notification($user_id, $password);
@@ -127 +127 @@
-                        exit();
-                } else {
-
+wp_
-                }
-        break;
@@ -134 +134 @@
-                check_admin_referer('editblog');
-                if( empty( $_POST ) )
-"You probably need to go back to the <a href='wpmu-blogs.php'>blogs page</a>"
+'You probably need to go back to the <a href="wpmu-blogs.php">blogs page</a>'
-
-                // themes
@@ -428 +428 @@
-                $user = $_POST['user'];
-                if ( empty($user['username']) && empty($user['email']) ) {
-"<p>Missing username and email.</p>"
+'Missing username and email.'
-                } elseif ( empty($user['username']) ) {
-"<p>Missing username.</p>"
+'Missing username.'
-                } elseif ( empty($user['email']) ) {
-"<p>Missing email.</p>"
+'<p>Missing email.'
-                }
-
@@ -439 +439 @@
-
-                if( false == $user_id ) {
-"<p>Duplicated username or email address.</p>"
+'Duplicated username or email address.'
-                } else {
-                        wp_new_user_notification($user_id, $password);

trunk/wp-admin/wpmu-options.php

@@ -7 +7 @@
-
-if( is_site_admin() == false ) {
-<p>You do not have permission to access this page.</p>
+You do not have permission to access this page.
-}
-

trunk/wp-admin/wpmu-themes.php

@@ -7 +7 @@
-
-if( is_site_admin() == false ) {
-<p>You do not have permission to access this page.</p>
+You do not have permission to access this page.
-}
-

trunk/wp-admin/wpmu-upgrade-site.php

@@ -12 +12 @@
-
-if( is_site_admin() == false ) {
-<p>You do not have permission to access this page.</p>
+You do not have permission to access this page.
-}
-