mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
This commit is contained in:
Nils Adermann
2010-05-16 19:52:36 +02:00
parent cf89952106 0bf2c3eed5
commit 591217a903
25 changed files with 195 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/develop/regex.php
View File

@@ -18,14 +18,15 @@ $ls32 = "(?:$h16:$h16|$ipv4)";
$ipv6_construct = array(
array(false, '', '{6}', $ls32),
array(false, '::', '{5}', $ls32),
array(false, '::', '{0,5}', "(?:$h16(?::$h16)?|$ipv4)"),
array('', ':', '{4}', $ls32),
array('{1,2}', ':', '{3}', $ls32),
array('{1,3}', ':', '{2}', $ls32),
array('{1,4}', ':', '', $ls32),
array('{1,5}', ':', false, $ls32),
array('{1,6}', ':', false, $h16),
array('{1,7}', ':', false, '')
array('{1,7}', ':', false, ''),
array(false, '::', false, '')
);
$ipv6 = '(?:';