IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cap checks instead of multisite and super admin checks. Add some new caps. Merge cleanup. see #11644.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-18 22:21:36 +00:00
parent 8760e7da1b
commit f7d7bc2dd0
15 changed files with 137 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
wp-includes/wp-db.php
View File

@@ -370,14 +370,13 @@ class wpdb {
if ( WP_DEBUG )
$this->show_errors();
if( is_multisite() ) {
$this->charset = 'utf8';
if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) {
$this->collate = constant( 'DB_COLLATE' );
} else {
$this->collate = 'utf8_general_ci';
}
}
if ( is_multisite() ) {
$this->charset = 'utf8';
if ( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' )
$this->collate = constant( 'DB_COLLATE' );
else
$this->collate = 'utf8_general_ci';
}
if ( defined('DB_CHARSET') )
$this->charset = DB_CHARSET;
@@ -446,12 +445,12 @@ class wpdb {
if ( preg_match('|[^a-z0-9_]|i', $prefix) )
return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/);
if( is_multisite() ) {
$old_prefix = '';
} else {
$old_prefix = $prefix;
}
if( isset( $this->base_prefix ) )
if ( is_multisite() )
$old_prefix = '';
else
$old_prefix = $prefix;
if ( isset( $this->base_prefix ) )
$old_prefix = $this->base_prefix;
$this->base_prefix = $prefix;
foreach ( $this->global_tables as $table )
@@ -664,22 +663,22 @@ class wpdb {
if ( !$this->show_errors )
return false;
// If there is an error then take note of it
if( is_multisite() ) {
$msg = "WordPress database error: [$str]\n{$this->last_query}\n";
if( defined( 'ERRORLOGFILE' ) )
error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
if( defined( 'DIEONDBERROR' ) )
die( $msg );
} else {
$str = htmlspecialchars($str, ENT_QUOTES);
$query = htmlspecialchars($this->last_query, ENT_QUOTES);
// If there is an error then take note of it
if ( is_multisite() ) {
$msg = "WordPress database error: [$str]\n{$this->last_query}\n";
if ( defined( 'ERRORLOGFILE' ) )
error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) );
if ( defined( 'DIEONDBERROR' ) )
die( $msg );
} else {
$str = htmlspecialchars($str, ENT_QUOTES);
$query = htmlspecialchars($this->last_query, ENT_QUOTES);
print "<div id='error'>
<p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br />
<code>$query</code></p>
</div>";
}
print "<div id='error'>
<p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br />
<code>$query</code></p>
</div>";
}
}
/**
@@ -739,10 +738,10 @@ class wpdb {
function db_connect( $query = "SELECT" ) {
global $db_list, $global_db_list;
if( is_array( $db_list ) == false )
if ( is_array( $db_list ) == false )
return true;
if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
$action = 'global';
$details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
$this->db_global = $details;