Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.756.2.48
diff -r1.756.2.48 common.inc
27a28,34
> * Create E_DEPRECATED constant for older PHP versions (<5.3).
> */
> if (!defined('E_DEPRECATED')) {
> define('E_DEPRECATED', 8192);
> }
>
> /**
580c587
< if ($errno & (E_ALL)) {
---
> if ($errno & (E_ALL ^ E_DEPRECATED)) {
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.121.2.5
diff -r1.121.2.5 file.inc
626c626
< $regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
---
> $regex = '/\.('. str_replace(' +', '|', preg_quote($extensions)) .')$/i';
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.265.2.19
diff -r1.265.2.19 form.inc
294a295,298
>
> // Make sure $form_state is passed around by reference.
> $args[1] = &$form_state;
>
Index: includes/unicode.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/unicode.inc,v
retrieving revision 1.29
diff -r1.29 unicode.inc
138c138
< if (!$bom && ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) {
---
> if (!$bom && preg_match('/^<\?xml[^>]+encoding="(.+?)"/', $data, $match)) {
148c148
< $data = ereg_replace('^(<\?xml[^>]+encoding)="([^"]+)"', '\\1="utf-8"', $out);
---
> $data = preg_replace('/^(<\?xml[^>]+encoding)="(.+?)"/', '\\1="utf-8"', $out);
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.115.2.5
diff -r1.115.2.5 blogapi.module
692c692
< if (eregi('([^<]*)', $contents, $title)) {
---
> if (preg_match('/(.*?)<\/title>/i', $contents, $title)) {
694c694
< $contents = ereg_replace('<title>[^<]*', '', $contents);
---
> $contents = preg_replace('/.*?<\/title>/i', '', $contents);
698a699
>
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.63.2.7
diff -r1.63.2.7 system.admin.inc
1974c1974
< function theme_status_report(&$requirements) {
---
> function theme_status_report($requirements) {
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.197.2.4
diff -r1.197.2.4 upload.module
516c516
< function theme_upload_form_current(&$form) {
---
> function theme_upload_form_current($form) {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.892.2.12
diff -r1.892.2.12 user.module
381,394c381,404
< if (!strlen($name)) return t('You must enter a username.');
< if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
< if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
< if (strpos($name, ' ') !== FALSE) return t('The username cannot contain multiple spaces in a row.');
< if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $name)) return t('The username contains an illegal character.');
< if (preg_match('/[\x{80}-\x{A0}'. // Non-printable ISO-8859-1 + NBSP
< '\x{AD}'. // Soft-hyphen
< '\x{2000}-\x{200F}'. // Various space characters
< '\x{2028}-\x{202F}'. // Bidirectional text overrides
< '\x{205F}-\x{206F}'. // Various text hinting characters
< '\x{FEFF}'. // Byte order mark
< '\x{FF01}-\x{FF60}'. // Full-width latin
< '\x{FFF9}-\x{FFFD}'. // Replacement characters
< '\x{0}]/u', // NULL byte
---
> if (!$name) {
> return t('You must enter a username.');
> }
> if (substr($name, 0, 1) == ' ') {
> return t('The username cannot begin with a space.');
> }
> if (substr($name, -1) == ' ') {
> return t('The username cannot end with a space.');
> }
> if (strpos($name, ' ') !== FALSE) {
> return t('The username cannot contain multiple spaces in a row.');
> }
> if (preg_match('/[^\x{80}-\x{F7} a-z0-9@_.\'-]/i', $name)) {
> return t('The username contains an illegal character.');
> }
> if (preg_match('/[\x{80}-\x{A0}' . // Non-printable ISO-8859-1 + NBSP
> '\x{AD}' . // Soft-hyphen
> '\x{2000}-\x{200F}' . // Various space characters
> '\x{2028}-\x{202F}' . // Bidirectional text overrides
> '\x{205F}-\x{206F}' . // Various text hinting characters
> '\x{FEFF}' . // Byte order mark
> '\x{FF01}-\x{FF60}' . // Full-width latin
> '\x{FFF9}-\x{FFFD}' . // Replacement characters
> '\x{0}-\x{1F}]/u', // NULL byte and control characters
398,399c408,410
< if (strpos($name, '@') !== FALSE && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t('The username is not a valid authentication ID.');
< if (strlen($name) > USERNAME_MAX_LENGTH) return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
---
> if (drupal_strlen($name) > USERNAME_MAX_LENGTH) {
> return t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
> }
1601c1612
< module_invoke_all('user', 'delete', $edit, $account);
---
> user_module_invoke('delete', $edit, $account);
1924a1936,1937
> // only variables can be passed by reference workaround
> $null = NULL;
1926c1939,1941
< if ($data = module_invoke($module, 'user', 'categories', NULL, $account, '')) {
---
> $function = $module .'_user';
> // we can't use neither module_invoke nor user_module_invoke because we need the return value and by reference
> if (function_exists($function) && ($data = $function('categories', $null, $user, ''))) {
2464,2465c2479,2482
< if ($data = module_invoke($module, 'user', $hook, $edit, $account, $category)) {
< $groups = array_merge_recursive($data, $groups);
---
> $function = $module .'_user';
> // we can't use neither module_invoke nor user_module_invoke because we need the return value and by reference
> if (function_exists($function) && ($data = $function($hook, $edit, $account, $category))) {
> $groups = array_merge($data, $groups);
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.11.2.1
diff -r1.11.2.1 user.pages.inc
151c151,153
< module_invoke_all('user', 'logout', NULL, $user);
---
> //// only variables can be passed by reference workaround
> $null = NULL;
> user_module_invoke('logout', $null, $user);