WP update, minor style fixes
This commit is contained in:
nikolark committed
1 parent
ac292562b6
commit
ca005d386a
10 files changed
+4439
-43
No files matched your search
+1
-1
@@ -9,7 +9,7 @@
|
||||
<body>
|
||||
<h1 id="logo">
|
||||
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
|
||||
<br /> Version 4.2
|
||||
<br /> Version 4.2.1
|
||||
</h1>
|
||||
<p style="text-align: center">Semantic Personal Publishing Platform</p>
|
||||
|
||||
|
||||
@@ -40,6 +40,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
|
||||
</a>
|
||||
</h2>
|
||||
|
||||
<div class="changelog point-releases">
|
||||
<h3><?php echo _n( 'Security Release', 'Security Releases', 1 ); ?></h3>
|
||||
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
|
||||
'<strong>Version %1$s</strong> addressed some security issues.', 1 ), '4.2.1' ); ?>
|
||||
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.2.1' ); ?>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="headline-feature feature-video">
|
||||
<embed type="application/x-shockwave-flash" src="https://v0.wordpress.com/player.swf?v=1.04" width="1000" height="560" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=e9kH4FzP&isDynamicSeeking=true"></embed>
|
||||
</div>
|
||||
|
||||
@@ -527,6 +527,9 @@ function upgrade_all() {
|
||||
if ( $wp_current_db_version < 31351 )
|
||||
upgrade_420();
|
||||
|
||||
if ( $wp_current_db_version < 31533 )
|
||||
upgrade_421();
|
||||
|
||||
maybe_disable_link_manager();
|
||||
|
||||
maybe_disable_automattic_widgets();
|
||||
@@ -1435,6 +1438,33 @@ function upgrade_420() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute changes made in WordPress 4.2.1.
|
||||
*
|
||||
* @since 4.2.1
|
||||
*/
|
||||
function upgrade_421() {
|
||||
global $wp_current_db_version, $wpdb;
|
||||
|
||||
if ( $wp_current_db_version < 31533 ) {
|
||||
$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
|
||||
if ( ! $content_length ) {
|
||||
$content_length = 65535;
|
||||
}
|
||||
|
||||
$comments = $wpdb->get_results(
|
||||
"SELECT comment_ID FROM $wpdb->comments
|
||||
WHERE comment_date_gmt > '2015-04-26'
|
||||
AND CHAR_LENGTH( comment_content ) >= $content_length
|
||||
AND ( comment_content LIKE '%<%' OR comment_content LIKE '%>%' )"
|
||||
);
|
||||
|
||||
foreach ( $comments as $comment ) {
|
||||
wp_delete_comment( $comment->comment_ID, true );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes network-level upgrade routines.
|
||||
*
|
||||
|
||||
Binary file not shown.
@@ -2,7 +2,7 @@
|
||||
# This file is distributed under the same license as the Administration package.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"PO-Revision-Date: 2015-04-23 18:50:10+0000\n"
|
||||
"PO-Revision-Date: 2015-04-27 20:16:30+0000\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@@ -11,83 +11,83 @@ msgstr ""
|
||||
"Project-Id-Version: Administration\n"
|
||||
|
||||
#. translators: 1: Term splitting guide link
|
||||
#: wp-admin/about.php:115
|
||||
#: wp-admin/about.php:123
|
||||
msgid "Terms shared across multiple taxonomies will be split when one of them is updated. Find out more in the <a href=\"%1$s\">Plugin Developer Handbook</a>."
|
||||
msgstr "Termer delt over flere taksonomier vil bli delt opp når én av dem oppdateres. Finn ut mer i <a href=\"%1$s\">Utviklerhåndboken for utvidelser</a>."
|
||||
|
||||
#: wp-admin/about.php:52
|
||||
#: wp-admin/about.php:60
|
||||
msgid "Clip it, edit it, publish it. Get familiar with the new and improved Press This. From the <a href=\"%s\">Tools</a> menu, add Press This to your browser bookmark bar or your mobile device home screen. Once installed you can share your content with lightning speed. Sharing your favorite videos, images, and content has never been this fast or this easy."
|
||||
msgstr "Klipp det, rediger det, publiser det. Bli kjent med den nye og forbedrede «Skriv om dette». I <a href=\"%s\">Verktøy</a>-menyen finner du «Skriv om dette»-appen, som du kan dra til din nettlesers bokmerkerad eller din mobile enhets hjem-skjerm. Etter at den er installert kan du dele ditt innhold lynraskt. Å dele dine favorittfilmer, -bilder og annet innhold har aldri være så raskt og enkelt."
|
||||
|
||||
#: wp-admin/about.php:82
|
||||
#: wp-admin/about.php:90
|
||||
msgid "Switch themes in the Customizer"
|
||||
msgstr "Bytt temaer i tematilpasseren"
|
||||
|
||||
#. translators: 1: WP_Query, 2: WP_Comment_Query, 3: WP_User_Query
|
||||
#: wp-admin/about.php:121
|
||||
#: wp-admin/about.php:129
|
||||
msgid "%1$s, %2$s, and %3$s now support complex ordering with named meta query clauses."
|
||||
msgstr "%1$s, %2$s og %3$s støtter nå kompleks rekkefølge med navngitte metaspørringsklausuler."
|
||||
|
||||
#. translators: %s wp.a11y.speak()
|
||||
#: wp-admin/about.php:108
|
||||
#: wp-admin/about.php:116
|
||||
msgid "You can now send audible notifications to screen readers in JavaScript with %s. Pass it a string, and an update will be sent to a dedicated ARIA live notifications area."
|
||||
msgstr "Du kan nå sende hørbare varsler til skjermlesere i JavaScript med %s. Send det en tekststreng, og en oppdatering vil bli sendt til et dedikert ARIA live varslingsområde."
|
||||
|
||||
#: wp-admin/about.php:92
|
||||
#: wp-admin/about.php:100
|
||||
msgid "Streamlined plugin updates"
|
||||
msgstr "Strømlinjeformede oppdateringer av utvidelser"
|
||||
|
||||
#: wp-admin/about.php:102
|
||||
#: wp-admin/about.php:110
|
||||
msgid "utf8mb4 support"
|
||||
msgstr "Støtte for utf8mb4"
|
||||
|
||||
#: wp-admin/about.php:103
|
||||
#: wp-admin/about.php:111
|
||||
msgid "Database character encoding has changed from utf8 to utf8mb4, which adds support for a whole range of new 4-byte characters."
|
||||
msgstr "Tegnkodingen i databasen er endret fra utf8 til utf8mb4, som betyr støtte for en hel serie av nye 4-byte tegn."
|
||||
|
||||
#. translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza
|
||||
#. emoji, 5: Emoji Codex link
|
||||
#: wp-admin/about.php:74
|
||||
#: wp-admin/about.php:82
|
||||
msgid "Don’t use any of those characters? You can still have fun — emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other <a href=\"%5$s\">emoji</a>."
|
||||
msgstr "Bruker du ikke noen av de tegnene? Du kan fortsatt ha det gøy: emoji er nå tilgjengelig i WordPress! Så slå deg løs og dekorér innholdet ditt med %1$s, %2$s, %3$s, %4$s, og alle de mange andre <a href=\"%5$s\">emoijene</a>. "
|
||||
|
||||
#: wp-admin/about.php:83
|
||||
#: wp-admin/about.php:91
|
||||
msgid "Browse and preview your installed themes from the Customizer. Make sure the theme looks great with <em>your</em> content, before it debuts on your site. "
|
||||
msgstr "Bla i og forhåndsvis dine installerte temaer fra tematilpasseren. Forsikre deg om at temaet ser bra ut med <em>ditt</em> innhold, før det får sin debut på ditt nettsted."
|
||||
|
||||
#: wp-admin/about.php:71
|
||||
#: wp-admin/about.php:79
|
||||
msgid "Writing in WordPress, whatever your language, just got better. WordPress 4.2 supports a host of new characters out-of-the-box, including native Chinese, Japanese, and Korean characters, musical and mathematical symbols, and hieroglyphs."
|
||||
msgstr "Å skrive i WordPress, uansett språk, har akkurat blitt bedre. WordPress støtter stadig flere språk. Nytt i 4.2 er kinesiske, japanske og koreanske tegn, i tillegg til musikalske og matematiske symboler, samt hieroglyfer. "
|
||||
|
||||
#: wp-admin/about.php:70
|
||||
#: wp-admin/about.php:78
|
||||
msgid "Extended character support"
|
||||
msgstr "Støtte for flere tegn og bokstaver"
|
||||
|
||||
#: wp-admin/about.php:51
|
||||
#: wp-admin/about.php:59
|
||||
msgid "An easier way to share content"
|
||||
msgstr "En enklere måte å dele innhold"
|
||||
|
||||
#: wp-admin/about.php:88
|
||||
#: wp-admin/about.php:96
|
||||
msgid "Paste links from Tumblr.com and Kickstarter and watch them magically appear right in the editor. With every release, your publishing and editing experience get closer together."
|
||||
msgstr "Lim inn lenker fra Tumblr.com og Kickstarter og se dem bygges inn automatisk rett i tekstbehandleren. Hver nye utgave av WordPress gjør publiserings- og redigerings­opplevelsen mer sømløs."
|
||||
|
||||
#: wp-admin/about.php:118
|
||||
#: wp-admin/about.php:126
|
||||
msgid "Complex query ordering"
|
||||
msgstr "Kompleks rekkefølge på spørringer"
|
||||
|
||||
#: wp-admin/about.php:93
|
||||
#: wp-admin/about.php:101
|
||||
msgid "Goodbye boring loading screen, hello smooth and simple plugin updates. Click <em>Update Now</em> and watch the magic happen."
|
||||
msgstr "Farvel til kjedelige innlastingsskjermer, hallo til strømlinjeformede og enkle utvidelsesoppdateringer. Klikk <em>Oppdater nå</em> og opplev magien."
|
||||
|
||||
#: wp-admin/about.php:87
|
||||
#: wp-admin/about.php:95
|
||||
msgid "Even more embeds"
|
||||
msgstr "Enda flere innbygginger"
|
||||
|
||||
#: wp-admin/about.php:112
|
||||
#: wp-admin/about.php:120
|
||||
msgid "Shared term splitting"
|
||||
msgstr "Deling av delte termer"
|
||||
|
||||
#: wp-admin/about.php:105
|
||||
#: wp-admin/about.php:113
|
||||
msgid "JavaScript accessibility"
|
||||
msgstr "JavaScript-tilgjengelighet"
|
||||
|
||||
@@ -95,7 +95,7 @@ msgstr "JavaScript-tilgjengelighet"
|
||||
msgid "Thank you for updating! WordPress %s helps you communicate and share, globally."
|
||||
msgstr "Takk for at du oppdaterer! WordPress %s hjelper deg å kommunisere og dele innhold med hele verden."
|
||||
|
||||
#: wp-admin/about.php:74
|
||||
#: wp-admin/about.php:82
|
||||
msgid "https://codex.wordpress.org/Emoji"
|
||||
msgstr "https://codex.wordpress.org/Emoji"
|
||||
|
||||
@@ -682,7 +682,7 @@ msgstr "Følg lenken for å åpne Skriv om dette. Så kan du legge den til dine
|
||||
msgid "Open Press This"
|
||||
msgstr "Åpne Skriv om dette"
|
||||
|
||||
#: wp-admin/about.php:53 wp-admin/tools.php:48
|
||||
#: wp-admin/about.php:61 wp-admin/tools.php:48
|
||||
msgid "Drag the bookmarklet below to your bookmarks bar. Then, when you’re on a page you want to share, simply “press” it."
|
||||
msgstr "Dra bokmerkeskriptet nedenfor til dine bokmerker. Da kan du enkelt skrive om en nettside som du har lyst å dele."
|
||||
|
||||
@@ -4140,12 +4140,12 @@ msgstr "Vis verktøylinjen når du ser på nettstedet"
|
||||
msgid "Contributing Developers"
|
||||
msgstr "Medvirkende utviklere"
|
||||
|
||||
#: wp-admin/about.php:166
|
||||
#: wp-admin/about.php:47 wp-admin/about.php:174
|
||||
msgid "For more information, see <a href=\"%s\">the release notes</a>."
|
||||
msgstr "For mer informasjon, se <a href=\"%s\">versjonsmerknadene</a>."
|
||||
|
||||
#. translators: 1: WordPress version number, 2: plural number of bugs.
|
||||
#: wp-admin/about.php:155
|
||||
#: wp-admin/about.php:163
|
||||
msgid "<strong>Version %1$s</strong> addressed %2$s bug."
|
||||
msgid_plural "<strong>Version %1$s</strong> addressed %2$s bugs."
|
||||
msgstr[0] "<strong>Versjon %1$s</strong> rettet %2$s programfeil."
|
||||
@@ -4153,7 +4153,7 @@ msgstr[1] "<strong>Versjon %1$s</strong> rettet %2$s programfeil."
|
||||
|
||||
#. translators: 1: WordPress version number, 2: plural number of bugs. Singular
|
||||
#. security issue.
|
||||
#: wp-admin/about.php:159
|
||||
#: wp-admin/about.php:167
|
||||
msgid "<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug."
|
||||
msgid_plural "<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs."
|
||||
msgstr[0] "<strong>Versjon %1$s</strong> tettet et sikkerhetshull og rettet %2$s programfeil."
|
||||
@@ -4161,7 +4161,7 @@ msgstr[1] "<strong>Versjon %1$s</strong> tettet et sikkerhetshull og rettet %2$s
|
||||
|
||||
#. translators: 1: WordPress version number, 2: plural number of bugs. More
|
||||
#. than one security issue.
|
||||
#: wp-admin/about.php:163
|
||||
#: wp-admin/about.php:171
|
||||
msgid "<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug."
|
||||
msgid_plural "<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs."
|
||||
msgstr[0] "<strong>Versjon %1$s</strong> tettet noen sikkerhetshull og rettet %2$s programfeil."
|
||||
@@ -4171,7 +4171,7 @@ msgstr[1] "<strong>Versjon %1$s</strong> tettet noen sikkerhetshull og rettet %2
|
||||
msgid "Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner."
|
||||
msgstr "Velkommen til kontrollpanelet i WordPress. Dette er det skjermbildet vil du se hver gang du logger inn på nettstedet, og gir deg tilgang alle administrative funksjoner i WordPress. Du kan få mer informasjon om hvert enkelt skjermbilde om du klikker Hjelp-fanen i øvre høyre hjørne."
|
||||
|
||||
#: wp-admin/about.php:147
|
||||
#: wp-admin/about.php:44 wp-admin/about.php:155
|
||||
msgid "Security Release"
|
||||
msgid_plural "Security Releases"
|
||||
msgstr[0] "Sikkerhetsoppdatering"
|
||||
@@ -4181,30 +4181,30 @@ msgstr[1] "Sikkerhetsoppdateringer"
|
||||
msgid "What’s New"
|
||||
msgstr "Hva er nytt"
|
||||
|
||||
#: wp-admin/about.php:148
|
||||
#: wp-admin/about.php:156
|
||||
msgid "Maintenance and Security Release"
|
||||
msgid_plural "Maintenance and Security Releases"
|
||||
msgstr[0] "Vedlikeholds- og sikkerhetsoppdatering"
|
||||
msgstr[1] "Vedlikeholds- og sikkerhetsoppdateringer"
|
||||
|
||||
#: wp-admin/about.php:146
|
||||
#: wp-admin/about.php:154
|
||||
msgid "Maintenance Release"
|
||||
msgid_plural "Maintenance Releases"
|
||||
msgstr[0] "Vedlikeholdsoppdatering"
|
||||
msgstr[1] "Vedlikeholdsoppdateringer"
|
||||
|
||||
#. translators: 1: WordPress version number.
|
||||
#: wp-admin/about.php:151
|
||||
#: wp-admin/about.php:45 wp-admin/about.php:159
|
||||
msgid "<strong>Version %1$s</strong> addressed a security issue."
|
||||
msgid_plural "<strong>Version %1$s</strong> addressed some security issues."
|
||||
msgstr[0] "<strong>Versjon %1$s</strong> tettet et sikkerhetshull"
|
||||
msgstr[0] "<strong>Versjon %1$s</strong> tettet et sikkerhetshull."
|
||||
msgstr[1] "<strong>Versjon %1$s</strong> tettet noen sikkerhetshull."
|
||||
|
||||
#: wp-admin/options-permalink.php:22
|
||||
msgid "This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures."
|
||||
msgstr "Dette skjermbildet lar deg velge strukturen på permalenkene dine. Du kan velge blant de vanligste eller opprette din egen URL-struktur."
|
||||
|
||||
#: wp-admin/about.php:130
|
||||
#: wp-admin/about.php:138
|
||||
msgid "Return to Updates"
|
||||
msgstr "Tilbake til oppdateringer"
|
||||
|
||||
@@ -4504,11 +4504,11 @@ msgstr "Sannsynligvis direkte inkludering av wp-admin/includes/template.php for
|
||||
msgid "Welcome to WordPress %s"
|
||||
msgstr "Velkommen til WordPress %s"
|
||||
|
||||
#: wp-admin/about.php:130
|
||||
#: wp-admin/about.php:138
|
||||
msgid "Return to Dashboard → Updates"
|
||||
msgstr "Tilbake til Kontrollpanel → Oppdateringer"
|
||||
|
||||
#: wp-admin/about.php:134
|
||||
#: wp-admin/about.php:142
|
||||
msgid "Go to Dashboard → Home"
|
||||
msgstr "Gå til Kontrollpanel → Hjem"
|
||||
|
||||
@@ -4520,7 +4520,7 @@ msgstr "WordPress er blitt til av et nettverk med ihuga entusiaster i hele verde
|
||||
msgid "Core Developers"
|
||||
msgstr "Kjerneutviklere"
|
||||
|
||||
#: wp-admin/about.php:98
|
||||
#: wp-admin/about.php:106
|
||||
msgid "Under the Hood"
|
||||
msgstr "Under panseret"
|
||||
|
||||
@@ -6857,7 +6857,7 @@ msgid_plural "Drop-ins <span class=\"count\">(%s)</span>"
|
||||
msgstr[0] "Innslipp <span class=\"count\">(%s)</span>"
|
||||
msgstr[1] "Innslipp <span class=\"count\">(%s)</span>"
|
||||
|
||||
#: wp-admin/about.php:134
|
||||
#: wp-admin/about.php:142
|
||||
msgid "Go to Dashboard"
|
||||
msgstr "Gå til kontrollpanel"
|
||||
|
||||
@@ -9112,7 +9112,7 @@ msgstr "Andre WordPress-nyheter"
|
||||
msgid "View all"
|
||||
msgstr "Vis alle"
|
||||
|
||||
#: wp-admin/about.php:56 wp-admin/tools.php:16 wp-admin/tools.php:40
|
||||
#: wp-admin/about.php:64 wp-admin/tools.php:16 wp-admin/tools.php:40
|
||||
#: wp-admin/tools.php:51
|
||||
msgid "Press This"
|
||||
msgstr "Skriv om dette"
|
||||
|
||||
@@ -5947,7 +5947,7 @@ msgstr "Vennligst logg inn igjen."
|
||||
msgid "Sidebar %d"
|
||||
msgstr "Sidekolonne %d"
|
||||
|
||||
#: wp-includes/wp-db.php:2835
|
||||
#: wp-includes/wp-db.php:2949
|
||||
msgid "<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher"
|
||||
msgstr "<strong>FEIL</strong>: WordPress %1$s krever MySQL %2$s eller høyere"
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ $padding-base: rem-calc(16);
|
||||
|
||||
/* General styles */
|
||||
body {
|
||||
background-color: $body-bg;
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-weight: 800;
|
||||
@@ -483,7 +484,7 @@ input[type=submit]{
|
||||
margin: 0;
|
||||
@media #{$large-up} {
|
||||
list-style: disc outside none;
|
||||
padding-left: rem-calc(12);
|
||||
padding: 0 rem-calc(12);
|
||||
|
||||
}
|
||||
li {
|
||||
|
||||
+4244
-1
File diff suppressed because it is too large.
Load diff
@@ -4,14 +4,14 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.2';
|
||||
$wp_version = '4.2.1';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
*
|
||||
* @global int $wp_db_version
|
||||
*/
|
||||
$wp_db_version = 31532;
|
||||
$wp_db_version = 31533;
|
||||
|
||||
/**
|
||||
* Holds the TinyMCE version
|
||||
|
||||
@@ -1946,11 +1946,20 @@ class wpdb {
|
||||
*/
|
||||
protected function process_fields( $table, $data, $format ) {
|
||||
$data = $this->process_field_formats( $data, $format );
|
||||
if ( false === $data ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$data = $this->process_field_charsets( $data, $table );
|
||||
if ( false === $data ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$data = $this->process_field_lengths( $data, $table );
|
||||
if ( false === $data ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$converted_data = $this->strip_invalid_text( $data );
|
||||
|
||||
if ( $data !== $converted_data ) {
|
||||
@@ -2031,6 +2040,40 @@ class wpdb {
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* For string fields, record the maximum string length that field can safely save.
|
||||
*
|
||||
* @since 4.2.1
|
||||
* @access protected
|
||||
*
|
||||
* @param array $data As it comes from the wpdb::process_field_charsets() method.
|
||||
* @param string $table Table name.
|
||||
* @return array|False The same array as $data with additional 'length' keys, or false if
|
||||
* any of the values were too long for their corresponding field.
|
||||
*/
|
||||
protected function process_field_lengths( $data, $table ) {
|
||||
foreach ( $data as $field => $value ) {
|
||||
if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
|
||||
// We can skip this field if we know it isn't a string.
|
||||
// This checks %d/%f versus ! %s because it's sprintf() could take more.
|
||||
$value['length'] = false;
|
||||
} else {
|
||||
$value['length'] = $this->get_col_length( $table, $field );
|
||||
if ( is_wp_error( $value['length'] ) ) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if ( false !== $value['length'] && mb_strlen( $value['value'] ) > $value['length'] ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$data[ $field ] = $value;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve one variable from the database.
|
||||
*
|
||||
@@ -2361,6 +2404,77 @@ class wpdb {
|
||||
return $charset;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the maximum string length allowed in a given column.
|
||||
*
|
||||
* @since 4.2.1
|
||||
* @access public
|
||||
*
|
||||
* @param string $table Table name.
|
||||
* @param string $column Column name.
|
||||
* @return mixed Max column length as an int. False if the column has no
|
||||
* length. WP_Error object if there was an error.
|
||||
*/
|
||||
public function get_col_length( $table, $column ) {
|
||||
$tablekey = strtolower( $table );
|
||||
$columnkey = strtolower( $column );
|
||||
|
||||
// Skip this entirely if this isn't a MySQL database.
|
||||
if ( false === $this->is_mysql ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( empty( $this->col_meta[ $tablekey ] ) ) {
|
||||
// This primes column information for us.
|
||||
$table_charset = $this->get_table_charset( $table );
|
||||
if ( is_wp_error( $table_charset ) ) {
|
||||
return $table_charset;
|
||||
}
|
||||
}
|
||||
|
||||
if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$typeinfo = explode( '(', $this->col_meta[ $tablekey ][ $columnkey ]->Type );
|
||||
|
||||
$type = strtolower( $typeinfo[0] );
|
||||
if ( ! empty( $typeinfo[1] ) ) {
|
||||
$length = trim( $typeinfo[1], ')' );
|
||||
} else {
|
||||
$length = false;
|
||||
}
|
||||
|
||||
switch( $type ) {
|
||||
case 'binary':
|
||||
case 'char':
|
||||
case 'varbinary':
|
||||
case 'varchar':
|
||||
return $length;
|
||||
break;
|
||||
case 'tinyblob':
|
||||
case 'tinytext':
|
||||
return 255; // 2^8 - 1
|
||||
break;
|
||||
case 'blob':
|
||||
case 'text':
|
||||
return 65535; // 2^16 - 1
|
||||
break;
|
||||
case 'mediumblob':
|
||||
case 'mediumtext':
|
||||
return 16777215; // 2^24 - 1
|
||||
break;
|
||||
case 'longblob':
|
||||
case 'longtext':
|
||||
return 4294967295; // 2^32 - 1
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a string is ASCII.
|
||||
*
|
||||
|
||||
Reference in new issue
Block a user