Commit Graph

217 Commits

Author SHA1 Message Date
Andrew Nacin a7097f60d5 Enforce a minimum of two arguments for wpdb::prepare(). The first argument is the query (or fragment thereof), which is required. Additional arguments are values to substitute into placeholders.
This will generate E_WARNINGs for insufficient arguments when prepare() is called with no additional arguments. This should discourage improper uses of prepare() under the guise of safely running a query.

props xknown. fixes #22262.



git-svn-id: https://develop.svn.wordpress.org/trunk@22429 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 19:30:59 +00:00
Andrew Nacin 3583696de7 When replacing floats in wpdb::prepare(), avoid escaped placeholders (%%f). props SergeyBiryukov. fixes #19861.
git-svn-id: https://develop.svn.wordpress.org/trunk@22304 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-25 20:52:50 +00:00
Ryan Boren 44a84d7b06 Correct phpdoc for wpdb::bail(). wp_die() is issued when show_errors is true, not false. Props SergeyBiryukov. fixes #22211
git-svn-id: https://develop.svn.wordpress.org/trunk@22254 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-17 13:11:45 +00:00
Ryan Boren 7ba5099795 Objects no longer need to be explicitly passed by ref to call_user_func*() to be callable. Props wonderboymusic. fixes #21865
git-svn-id: https://develop.svn.wordpress.org/trunk@22118 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-04 20:00:16 +00:00
Andrew Nacin 26bd73ddd1 Call error_log() in wp-db without unnecessary conditionals. fixes #21103.
git-svn-id: https://develop.svn.wordpress.org/trunk@21807 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 01:35:43 +00:00
Andrew Nacin b15fec4e42 Basic support for the mysql_connect() new_link and client_flags arguments. props Otto42, fixes #19324.
git-svn-id: https://develop.svn.wordpress.org/trunk@21609 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-24 17:44:21 +00:00
Ryan Boren 70061dfb5f Update @since for various wpdb properties. Props SergeyBiryukov. fixes #21582
git-svn-id: https://develop.svn.wordpress.org/trunk@21521 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-15 15:32:35 +00:00
Andrew Nacin 821a0d8181 @since for wpdb's result property. props SergeyBiryukov. see #21533.
git-svn-id: https://develop.svn.wordpress.org/trunk@21513 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-14 20:34:12 +00:00
Andrew Nacin c653147d47 Add magic set, isset, and unset to wpdb. props pento.
These magic methods allow us to mark properties as protected or private, without breaking compatibility, as they were once accessible. The joys of PHP4.

fixes #18510.



git-svn-id: https://develop.svn.wordpress.org/trunk@21512 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-14 20:26:04 +00:00
Andrew Nacin 69881dfee7 Eliminate error suppression for mysql_free_result() and only call it when the result is actually a resource. Depending on the query, mysql_query() can return a boolean rather than a resource, hence the original use of error suppression.
Fixes a warning introduced in [21472] when calling mysql_free_result() was moved to flush().

fixes #20838.



git-svn-id: https://develop.svn.wordpress.org/trunk@21511 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-14 20:21:10 +00:00
Andrew Nacin 5a45a59cb2 Declare, document, and protect $dbuser, $dbpassword, $dbname, $dbhost and $dbh in wpdb.
These properties, while protected, are still accessible thanks to the magic getter added in [21472].

props pento, nvartolomei, joelhardi. fixes #18510.



git-svn-id: https://develop.svn.wordpress.org/trunk@21473 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:28:57 +00:00
Andrew Nacin b3fb67a97d Lazy-load column info in wpdb. props pento. fixes #20838.
git-svn-id: https://develop.svn.wordpress.org/trunk@21472 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:24:59 +00:00
Andrew Nacin 4218686707 Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.
props simonwheatley, pento. fixes #18451.



git-svn-id: https://develop.svn.wordpress.org/trunk@21471 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:13:48 +00:00
Andrew Nacin aba535c65b Deprecate wpdb::supports_collation() in favor of wpdb::has_cap().
props hakre, pento. fixes #16757.



git-svn-id: https://develop.svn.wordpress.org/trunk@21470 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:06:57 +00:00
Andrew Nacin 9db38e39ab Correctly identify queries where a line break follows a keyword, rather than a space. props GeertDD, fixes #19467.
git-svn-id: https://develop.svn.wordpress.org/trunk@21178 602fd350-edb4-49c9-b593-d223f7449a82
2012-06-29 15:08:17 +00:00
Andrew Nacin 57eb45641e Handle localized floats in $wpdb->prepare(). props kurtpayne. fixes #19861.
git-svn-id: https://develop.svn.wordpress.org/trunk@21161 602fd350-edb4-49c9-b593-d223f7449a82
2012-06-28 19:57:31 +00:00
Andrew Nacin 70431f074c Escape special characters when outputting DB failures. see #13839.
git-svn-id: https://develop.svn.wordpress.org/trunk@20483 602fd350-edb4-49c9-b593-d223f7449a82
2012-04-16 21:55:47 +00:00
Jon Cave 6fba47a265 Correct @since and remove invalid code example in wpdb::delete() documentation. Props GaryJ, scribu. See #18948.
git-svn-id: https://develop.svn.wordpress.org/trunk@20292 602fd350-edb4-49c9-b593-d223f7449a82
2012-03-27 12:00:39 +00:00
Andrew Nacin 54a6a40533 Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948.
git-svn-id: https://develop.svn.wordpress.org/trunk@20287 602fd350-edb4-49c9-b593-d223f7449a82
2012-03-24 15:24:31 +00:00
Peter Westwood b3a331887a Refactor WPDB::get_caller() into wp_debug_backtrace_summary() and improve the functionality to provide enhanced context and a standardised default pretty format. Fixes #19589
git-svn-id: https://develop.svn.wordpress.org/trunk@19773 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-28 11:56:50 +00:00
Andrew Nacin 2fd55c3df1 Introduce wp_load_translations_early(), which can be used before the locale is properly loaded in order to translate early error strings. Internationalize setup-config.php -- translators no longer have a reason to modify this file. fixes #18180.
git-svn-id: https://develop.svn.wordpress.org/trunk@19760 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-26 20:34:27 +00:00
Ryan Boren 2b186b0c45 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: https://develop.svn.wordpress.org/trunk@19712 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-08 17:01:11 +00:00
Jon Cave d43d6e5765 Stop quotes being incorrectly added to prepare placeholders in wpdb::_insert_replace_helper(). Fixes #19016.
git-svn-id: https://develop.svn.wordpress.org/trunk@19692 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-05 21:29:57 +00:00
Andrew Nacin fa9f927d75 Ask for a float from microtime() for timer_start(), timer_stop(). Clarify docs. props solarissmoke, fixes #19157.
git-svn-id: https://develop.svn.wordpress.org/trunk@19611 602fd350-edb4-49c9-b593-d223f7449a82
2011-12-20 21:36:53 +00:00
Ryan Boren 676ba7043e Use one space, not two, after trailing punctuation. fixes #19537
git-svn-id: https://develop.svn.wordpress.org/trunk@19593 602fd350-edb4-49c9-b593-d223f7449a82
2011-12-13 23:45:31 +00:00
Andrew Nacin e624bef124 Remove reference to get_last_error(), it doesn't exist. props mitchoyoshitaka, fixes #19002.
git-svn-id: https://develop.svn.wordpress.org/trunk@19288 602fd350-edb4-49c9-b593-d223f7449a82
2011-11-15 00:18:41 +00:00
Ryan Boren 722c6d7003 Avoid 'Only variables should be passed by reference' warnings. Props SergeyBiryukov. see #18975
git-svn-id: https://develop.svn.wordpress.org/trunk@19074 602fd350-edb4-49c9-b593-d223f7449a82
2011-10-28 15:48:44 +00:00
Andrew Nacin fcf1696de4 Introduce ->mysql to allow drop-ins to declare themselves as MySQL and therefore allow minimum version checks to still apply. fixes #18176.
git-svn-id: https://develop.svn.wordpress.org/trunk@19060 602fd350-edb4-49c9-b593-d223f7449a82
2011-10-25 05:29:28 +00:00
Ryan Boren 789dab3f20 Avoid 'Only variables should be passed by reference' warnings. Reverts [18110]. see #18975
git-svn-id: https://develop.svn.wordpress.org/trunk@18998 602fd350-edb4-49c9-b593-d223f7449a82
2011-10-18 20:44:39 +00:00
Jon Cave b60222700e Documentation fixes. See #18560.
- Add missing parameters
 - Add missing @param data types
 - s/format_where/where_format/


git-svn-id: https://develop.svn.wordpress.org/trunk@18753 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-22 12:02:31 +00:00
Dion Hulse 670784bcc3 Add documentation for floats (%f) to wpdb::prepare() and friends. Props dllh. Fixes #18407
git-svn-id: https://develop.svn.wordpress.org/trunk@18714 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-19 05:15:44 +00:00
Jon Cave 82c0f09c09 Fix typos in documentation (wp-includes/[i-z]). See #18560.
git-svn-id: https://develop.svn.wordpress.org/trunk@18639 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-05 19:08:15 +00:00
Dion Hulse 8fc9270239 Clarify %d is an integer in wpdb documentation. See #18407
git-svn-id: https://develop.svn.wordpress.org/trunk@18573 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-19 15:01:35 +00:00
Ryan Boren cdd05b3c9f Sanitize sort_column and sort_order in get_pages(). Escape search_term in WP_User_Search. Cast blog_id to int in get_blog_prefix(). Props duck_
git-svn-id: https://develop.svn.wordpress.org/trunk@18350 602fd350-edb4-49c9-b593-d223f7449a82
2011-06-27 20:47:04 +00:00
Andrew Nacin 36f1805ec4 Take that, PHP 5.0.5. Good riddens. see #14160.
git-svn-id: https://develop.svn.wordpress.org/trunk@18110 602fd350-edb4-49c9-b593-d223f7449a82
2011-06-01 22:03:36 +00:00
Ryan Boren 6cde0d88f9 Properly handle return value of DDL statements. Props scribu, marcis20. fixes #11372
git-svn-id: https://develop.svn.wordpress.org/trunk@18063 602fd350-edb4-49c9-b593-d223f7449a82
2011-05-27 15:46:56 +00:00
Ryan Boren 413723f08e Correct phpdoc for replacing/extending thewpdb class. Props johnbillion. fixes #17533
git-svn-id: https://develop.svn.wordpress.org/trunk@18011 602fd350-edb4-49c9-b593-d223f7449a82
2011-05-23 23:37:16 +00:00
Ryan Boren d470b22d59 Remove PHP4 constructors. Props hakre. see #16768
git-svn-id: https://develop.svn.wordpress.org/trunk@17604 602fd350-edb4-49c9-b593-d223f7449a82
2011-04-05 17:25:08 +00:00
Ryan Boren 04aea0e128 Don't die inside db_connect() if connection fails. Let dead_db() handle it. fixes #16640 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@17546 602fd350-edb4-49c9-b593-d223f7449a82
2011-03-23 19:57:35 +00:00
Andrew Nacin 21c2c70e25 Remove dead globals. props mitchoyoshitaka. fixes #16571.
git-svn-id: https://develop.svn.wordpress.org/trunk@17538 602fd350-edb4-49c9-b593-d223f7449a82
2011-03-23 18:39:16 +00:00
Ryan Boren 43b0ccccbc Don't die for failed db connects during install. Props westi. fixes #16640 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@17536 602fd350-edb4-49c9-b593-d223f7449a82
2011-03-23 17:46:40 +00:00
Ryan Boren 75028c8b48 @since additions and updates. Props demetris. fixes #15867
git-svn-id: https://develop.svn.wordpress.org/trunk@17079 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-20 12:49:18 +00:00
Andrew Nacin 24b60aee0d Don't improperly whitescreen on incorrect DB credentials during setup-config. Show error message with an opportunity to try again. fixes #15682.
git-svn-id: https://develop.svn.wordpress.org/trunk@16788 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-08 07:12:44 +00:00
Ryan Boren 36a4508140 Update since phpdoc. Props demetris. fixes #15445
git-svn-id: https://develop.svn.wordpress.org/trunk@16660 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-01 19:24:38 +00:00
Peter Westwood f8f48b0f24 Revert [16320] and [16321] for now. Breaks things
git-svn-id: https://develop.svn.wordpress.org/trunk@16336 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-12 22:44:16 +00:00
Andrew Nacin 92b8c22e03 Only mysql_free_result if we have a valid resource, and remove error suppression there. see #15402.
git-svn-id: https://develop.svn.wordpress.org/trunk@16321 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-12 10:40:43 +00:00
Andrew Nacin 9404ce9a12 Memory usage and execution improvements in wpdb. Store and work with resources directly, rather than full copies of results. Plugins which incorrectly used wpdb->last_result (a private property) will need to shift to wpdb->get_results() with no \$query. Magic getter is introduced for back compat when using PHP5. props joelhardi, fixes #12257.
git-svn-id: https://develop.svn.wordpress.org/trunk@16320 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-12 10:15:18 +00:00
Andrew Nacin 7e48ac3e78 Pruning shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@15904 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-21 19:55:28 +00:00
Andrew Nacin fb4e38b0e7 Pinking shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@15843 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-19 07:48:22 +00:00
Peter Westwood 1da3c94e55 Display mysql_connect errors when WP_DEBUG is enabled. Fixes #14654 props lloydbudd and hakre
Always die if we can't connect to the db no point in going any futher.

git-svn-id: https://develop.svn.wordpress.org/trunk@15808 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-14 18:47:39 +00:00