Commit graph

11078 commits

Author SHA1 Message Date
Joas Schilling
0b85dded29 [ticket/9684] View origin-forumname for GAs in topic-list
Correct some links using ['forum_id'] instead of $forum_id.
Correctly handle from "sort by day"-viewforum when there are global
announcements displayed in the forum.

PHPBB3-9684
2011-04-07 13:47:10 +02:00
Joas Schilling
712a51caea [ticket/9684] Fix Forum/Topic-Tracking for global announcements
Should be ready for intensive testing now.

PHPBB3-9684
2011-04-07 13:47:08 +02:00
Joas Schilling
9265ffbcd5 [ticket/9684] Fix a SQL-Error in the posting.php
PHPBB3-9684
2011-04-07 13:47:07 +02:00
Joas Schilling
27fdcb4c7e [ticket/9684] Remove code in some more files especially includes/
Topic-Tracking is still missing.

PHPBB3-9684
2011-04-07 13:47:06 +02:00
Joas Schilling
3352141264 [ticket/9684] Remove code for global announcement in root-files
PHPBB3-9684
2011-04-07 13:45:44 +02:00
Andreas Fischer
7074d19c40 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
  [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
2011-04-05 00:31:42 +02:00
Andreas Fischer
ebc338b9f3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
  [ticket/9751] Compare $password with empty string instead of casting it to bool
  [ticket/9751] Use a switch/case block without break for password complexity.
  [ticket/9751] Password requirement "Must contain letters and numbers" fails
2011-04-01 15:11:55 +02:00
Igor Wiedler
a40bc114c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:32:11 +02:00
Igor Wiedler
d70927e5de Merge remote branch 'haklop/feature/redis' into develop
* haklop/feature/redis:
  [feature/redis] Add Redis cache driver using phpredis extension
2011-03-31 20:24:35 +02:00
Igor Wiedler
87ed48f21b [ticket/10110] Remove redis acm driver from develop-olympus
PHPBB3-10110
2011-03-31 20:24:25 +02:00
Igor Wiedler
10784439ed Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10110] Remove tab from empty lines
  [ticket/10110] Enable the serialization and add a constant for defined the database
  [ticket/10110] Update comments with a link to the phpredis extension
  [ticket/10110] Add Redis ACM backend
2011-03-31 20:24:11 +02:00
Eric
30193fdc7e [feature/redis] Add Redis cache driver using phpredis extension
PHPBB3-10110
2011-03-30 11:29:11 +08:00
Andreas Fischer
3a0a18ee25 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9946] Allow storage of data >4kB on Oracle again
2011-03-24 09:22:36 +01:00
Oleg Pudeyev
1312e5b965 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
2011-03-23 20:32:03 -04:00
Oleg Pudeyev
6b671176ed Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10107] Add cache to the enumeration, make statement more generic
  [ticket/10107] Make it clear that provided httpd samples are not perfect
  [ticket/10107] Add a webserver section to docs/INSTALL.html
2011-03-23 20:12:25 -04:00
Igor Wiedler
c63676e802 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10033] "Disallow usernames" does not check already disallowed names.
2011-03-23 23:21:36 +01:00
Oleg Pudeyev
352ed5acf8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10101] Add test case for native phpass hashes
  [ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:14 -04:00
Igor Wiedler
5cc8617128 Merge branch 'ticket/10021-develop' into develop
* ticket/10021-develop:
  [ticket/10021] Adjust ticket/10021 for develop
2011-03-20 23:12:48 +01:00
Igor Wiedler
634392aa1b [ticket/10021] Adjust ticket/10021 for develop
Ascraeus is PHP5.2+, so we no longer need to check for -1.

PHPBB3-10021
2011-03-20 23:09:24 +01:00
Igor Wiedler
ce92724514 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10021] Add comment explaining why we can check -1 as an error value.
  [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
2011-03-20 23:06:23 +01:00
Igor Wiedler
30daee12f9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
2011-03-20 22:42:51 +01:00
Igor Wiedler
3d8f438b76 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9806] Script for merging pull requests
2011-03-20 22:31:29 +01:00
Igor Wiedler
df8b852709 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
2011-03-18 00:06:53 +01:00
Andreas Fischer
0e9b755667 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
2011-03-15 02:00:04 +01:00
Andreas Fischer
7588b43526 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10096] Fixed whitespace in functions.php.
  [ticket/10078] Avoid \n in strings given to echo for portability.
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
2011-03-14 13:58:57 +01:00
Oleg Pudeyev
089e3a9ff4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
2011-03-12 23:33:55 -05:00
Oleg Pudeyev
8053be52e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9948] Inline quicktime files won't show
2011-03-12 19:14:04 -05:00
Igor Wiedler
d319fe1883 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
2011-03-12 18:23:47 +01:00
Igor Wiedler
cfede1db83 Merge branch 'ticket/bantu/10046-develop' into develop
* ticket/bantu/10046-develop:
  [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
2011-03-12 18:17:25 +01:00
Igor Wiedler
a27a39ebed Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10046] Do not link bots to cron.php.
  [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
  [ticket/10046] Call flush() in cron.php
  [ticket/10046] Remove calls to register_shutdown_function() in cron.php

Conflicts:
	phpBB/cron.php
	phpBB/includes/functions.php
2011-03-12 18:16:10 +01:00
Andreas Fischer
a627133b15 [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
PHPBB3-10046
2011-03-12 15:07:31 +01:00
Oleg Pudeyev
df096b6b52 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:46 -05:00
Oleg Pudeyev
db70d613bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
2011-03-11 19:44:54 -05:00
Andreas Fischer
f0a000b176 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)
  [ticket/10016] Leave Firebird unchanged.
  [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.

Conflicts:
	phpBB/includes/functions.php
2011-03-11 02:16:28 +01:00
Oleg Pudeyev
31eb45897a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10057] Fixes for a bunch of small problems.
  [ticket/10035] ACP template edit feature allows to read any files on webserver.
  [ticket/10057] Handle the case of missing interbase extension better.
  [ticket/10057] Fixed wrong usage of sql_error again, in firebird.
  [ticket/10057] Fixed usage of sql_error again.
  [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
  [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
  [ticket/10057] Skip ibase_service_attach if firebird connection failed.
  [ticket/10057] Check for interbase function existence.
  [ticket/10057] Split statements in firebird dbal for readability.
  [ticket/10057] Include error collector class file in postgres dbal.
  [ticket/10057] Moved error collector class into its own file.
  [ticket/10057] Use a class for error collection.
  [ticket/10057] More informative error messages in postgres dbal.
  [ticket/10057] No negative array indexing.
  [ticket/10057] Report postgres db connection errors.
2011-03-10 05:25:36 -05:00
Andreas Fischer
062c951d33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10079] Add gallery avatars to .gitignore.
  [ticket/10069] Improvements to sample nginx configuration.
2011-03-07 22:01:37 +01:00
Andreas Fischer
e00a868ce3 Merge branch 'ticket/igorw/9669' into develop
* ticket/igorw/9669:
  [ticket/9669] Replace spaces with tabs
  [ticket/9669] Switch if/else to make the if positive
  [ticket/9669] Make sure normalize_nfc returns string
  [ticket/9669] Add isNormalized checks for performance
  [ticket/9669] Add native Normalizer support
2011-03-07 21:56:24 +01:00
Nils Adermann
ffb697f7d0 Merge branch 'ticket/naderman/10080' into develop
* ticket/naderman/10080:
  [ticket/10080] Allow resetting the request instance used by request_var.
2011-03-07 19:19:49 +01:00
Nils Adermann
a0930e78c6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
2011-03-07 19:10:19 +01:00
Nils Adermann
458b8841eb [ticket/10080] Allow resetting the request instance used by request_var.
PHPBB3-10080
2011-03-07 18:54:52 +01:00
Andreas Fischer
a444eec473 Merge branch 'ticket/naderman/10011' into develop
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ uses I missed in previous commit
2011-03-07 17:29:19 +01:00
Nils Adermann
01dce65aee [ticket/10011] Removing __DIR__ uses I missed in previous commit
PHPBB3-10011
2011-03-07 17:26:31 +01:00
Andreas Fischer
cda3ba62b9 Merge branch 'ticket/naderman/10011' into develop
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
2011-03-07 17:13:23 +01:00
Nils Adermann
4f14ae94e2 [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
PHPBB3-10011
2011-03-07 17:08:55 +01:00
Andreas Fischer
bd03419f87 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
2011-03-07 16:32:58 +01:00
Igor Wiedler
90cc061fc0 [ticket/9669] Replace spaces with tabs
PHPBB3-9669
2011-03-07 09:49:58 +01:00
Igor Wiedler
6681b2417a [ticket/9669] Switch if/else to make the if positive
PHPBB3-9669
2011-03-06 21:39:42 +01:00
Oleg Pudeyev
f0b36961fc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
2011-03-06 14:53:53 -05:00
Andreas Fischer
239cb56af0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9824] Accept commit messages with less than perfect headings.
  [ticket/9824] Allow empty lines after ticket reference.
  [ticket/9824] Use printf instead of echo to render \n.
  [ticket/9824] Handle empty commit messages in commit-msg hook.
  [ticket/10059] Fix two misspellings of consistent.
  [ticket/9824] Add space after [ticket/12345] in prepared commit message.
  [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
2011-03-06 15:08:29 +01:00
Igor Wiedler
6df35c2cb6 [ticket/9669] Make sure normalize_nfc returns string
Normalizer::normalize can return null, cast to a string.

PHPBB3-9669
2011-03-05 11:52:22 +01:00