Nils Adermann ca1944ebe2 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
  [ticket/9802] Only check for IPv4-mapped address when address is IPv6.
  [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
  [ticket/9802] Remove redundant character class definition from preg_replace.
  [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.

Conflicts:
	phpBB/includes/session.php

2011-06-10 00:53:38 +02:00

..

adm

Merge branch 'develop-olympus' into develop

2011-06-09 13:00:39 +02:00

cache

…

develop

Merge branch 'develop-olympus' into develop

2011-05-23 23:59:56 +02:00

docs

Merge branch 'ticket/haklop/10110' into develop-olympus

2011-03-31 20:23:30 +02:00

download

Merge branch 'develop-olympus' into develop

2011-05-10 23:46:24 -04:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2011-06-10 00:53:38 +02:00

install

Merge branch 'develop-olympus' into develop

2011-06-02 04:53:48 +02:00

language

Merge branch 'develop-olympus' into develop

2011-06-10 00:26:41 +02:00

store

…

styles

Merge branch 'develop-olympus' into develop

2011-06-09 23:24:05 +02:00

.htaccess

…

common.php

Merge branch 'develop-olympus' into develop

2011-06-03 12:54:37 +02:00

cron.php

[ticket/10046] Remove register_shutdown_function() in cron.php from develop.

2011-03-12 15:07:31 +01:00

faq.php

…

feed.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

index.php

[ticket/10173] Use correct variable, checking for $birthday_year was correct.

2011-05-11 11:21:37 +02:00

mcp.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

memberlist.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

posting.php

Merge branch 'develop-olympus' into develop

2011-06-10 00:26:41 +02:00

report.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

search.php

[ticket/9684] Fix Forum/Topic-Tracking for global announcements

2011-04-07 13:47:08 +02:00

style.php

Merge branch 'develop-olympus' into develop

2011-05-10 23:46:24 -04:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-05-13 01:29:57 +02:00

viewforum.php

Merge branch 'develop-olympus' into develop

2011-06-09 21:59:52 +02:00

viewonline.php

[ticket/9549] Enhance teampage and legend functionality

2011-02-16 18:21:49 +01:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-06-09 21:59:52 +02:00

web.config

…