mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Code Issues Releases Wiki Activity
11,038 Commits 18 Branches 192 Tags
ef8160e8a2a1dbb51cd2603eefcd9309d2daece8
Commit Graph

1339 Commits

Author SHA1 Message Date
Nils Adermann
2ed9b3e1d5 Merge branch 'ticket/nickvergessen/9886' into develop-olympus 
* ticket/nickvergessen/9886:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
 2010-11-10 16:16:16 +01:00
Igor Wiedler
c9c19874d6 [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20 
PHPBB3-9884
 2010-11-10 15:50:53 +01:00
Joas Schilling
d722eeb64b [ticket/9886] Update fails on PostgreSQL because of an error in _add_module 
PHPBB3-9886
 2010-11-09 07:56:37 +01:00
Andreas Fischer
05dce726d0 Merge branch 'ticket/nickvergessen/9888' into develop-olympus 
* ticket/nickvergessen/9888:
  [ticket/9888] Update fails when Bing [Bot] was already added to the users table
 2010-11-08 23:41:19 +01:00
Nils Adermann
1a637a3860 Merge branch 'ticket/bantu/9885' into develop-olympus 
* ticket/bantu/9885:
  [ticket/9885] Fix extension group name updater. Loop through all languages.
 2010-11-08 23:22:23 +01:00
Joas Schilling
b88f35caef [ticket/9888] Update fails when Bing [Bot] was already added to the users table 
Added a check whether the user already exists before we try to add it.

PHPBB3-9888
 2010-11-08 23:22:06 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Andreas Fischer
f7e37dae86 [ticket/9885] Fix extension group name updater. Loop through all languages. 
Fix a regression introduced by 58dc5a191c.

The problem is that $user->add_lang() includes language strings from the board
root folder instead of the update folder. Because the database updater is run
first, the root folder files have not been upgrade yet. Thus, the language
strings we're looking for cannot be found.

Since the language strings we are looking for have been moved from the
install.php language file to acp/attachments.php it should be possible to
always find them in either file. When there is an acp/attachments.php file in
the update package, it can also be used.

We now also loop through all the installed languages as well, because the board
could have been installed in a language other than the admin's current
language.

PHPBB3-9885
PHPBB3-7717
 2010-11-08 14:19:53 +01:00
Nils Adermann
e87a8ef02c Merge branch 'ticket/igorw/9807' into develop-olympus 
* ticket/igorw/9807:
  [ticket/9807] Update existing module permissions in database
  [ticket/9807] Hide avatar tab in UCP when avatars are disabled
 2010-10-23 14:08:38 +02:00
Igor Wiedler
b9afa26280 [ticket/9807] Update existing module permissions in database 
PHPBB3-9807
 2010-10-21 10:22:03 +02:00
Igor Wiedler
41245f9f7a Merge branch 'ticket/bantu/9091' into develop-olympus 
* ticket/bantu/9091:
  [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
 2010-09-16 23:38:50 +02:00
Igor Wiedler
9015e03d05 Merge branch 'ticket/bantu/9613' into develop-olympus 
* ticket/bantu/9613:
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
 2010-09-16 22:34:48 +02:00
Igor Wiedler
161be96c66 Merge branch 'ticket/bantu/9748' into develop-olympus 
* ticket/bantu/9748:
  [ticket/9748] Replace <br /> before converting < and > to their entities.
 2010-09-12 14:59:59 +02:00
Igor Wiedler
bb191a1d69 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update 
Fixes following SQL error when updating the database to 3.0.6.

BLOB column 'post_username' used in key specification without a key length

PHPBB3-8944
 2010-09-03 22:26:06 +02:00
rxu
b83163634f [ticket/9613] Fix missing database part for unread posts search load switch. 
A record for load_unreads_search parameter had to be added to CONFIG_TABLE.

PHPBB3-9613
 2010-08-29 16:09:41 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus 
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
 2010-08-28 23:25:05 +02:00
Josh Woody
68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus 
* ticket/bantu/9167:
  [ticket/9167] Detect and remove any dead left over shadow topics on update.
  [ticket/9167] Remove shadow topics from remaining forums when deleting a forum

Conflicts:
	phpBB/install/database_update.php
 2010-08-19 10:09:32 -05:00
Joas Schilling
884cc2ac9b [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). 
includes/functions_convert.php and install/install_convert.php tested by Dicky.

PHPBB3-9519
 2010-08-13 16:40:56 +02:00
Joas Schilling
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). 
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
 2010-08-10 16:11:39 +02:00
Richard Foote
66fc086742 [ticket/9748] Replace <br /> before converting < and > to their entities. 
PHPBB3-9748
 2010-07-24 11:48:47 +02:00
Andreas Fischer
e5d5d58172 [ticket/9091] Extract IPv4 address from addresses mapped into IPv6. 
PHPBB3-9091
 2010-07-23 12:48:01 +02:00
Andreas Fischer
eb7254a0c4 Merge branch 'ticket/naderman/9140' into develop-olympus 
* ticket/naderman/9140:
  [ticket/9140] Check current board version in incremental update packages
 2010-07-12 01:38:39 +02:00
Gabriel Vazquez
2ba6360e43 [ticket/9140] Check current board version in incremental update packages 
Since we do not want to limit the updater functionality we only display
a prominent warning when the current board version does not match the
version the update files are meant to update from.

PHPBB3-9140
 2010-07-12 01:37:05 +02:00
Andreas Fischer
2d9aa45aef Merge branch 'ticket/jellydoughnut/9637' into develop-olympus 
* ticket/jellydoughnut/9637:
  [ticket/9637] Do not cache SQL server version in all cases
 2010-07-11 01:44:59 +02:00
Josh Woody
9c61455d26 [ticket/9637] Do not cache SQL server version in all cases 
Because the existing cache is global, there is no way to differentiate between
each of two databases which may be two different DBAL objects pointing to
servers with wildly different versions of an RDBMS. phpBB only has this
situation in the UCF, thus only one file changed outside the DBAL. I have
added a second optional parameter, $use_cache to each of the implementations
of dbal::sql_server_info()

PHPBB3-9637
 2010-07-11 01:41:38 +02:00
Andreas Fischer
f92c96d424 Merge branch 'ticket/jellydoughnut/9690' into develop-olympus 
* ticket/jellydoughnut/9690:
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
 2010-07-08 19:49:22 +02:00
Andreas Fischer
c79df9700d Merge branch 'ticket/nickvergessen/9578' into develop-olympus 
* ticket/nickvergessen/9578:
  [ticket/9578] ACP Posting tab is missing "Post settings" module.
 2010-07-08 02:20:25 +02:00
Josh Woody
d00f2ec183 [ticket/9690] Add forthcoming Bing Bot to list of recognized bots 
Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent.  This updates phpBB to be aware of Bing Bot

PHPBB3-9690
 2010-07-07 15:51:31 -05:00
Andreas Fischer
38fc35a497 [ticket/9167] Detect and remove any dead left over shadow topics on update. 
PHPBB3-9167
 2010-06-11 21:52:04 +02:00
Joas Schilling
4637709f0a [ticket/9628] _add_module 'after'-parameter does not work correctly. 
The modules were grouped by left_id so num_modules is always one (hopefully), but the number of rows is the actual value we'd like to know. Removing the GROUP BY resolves the issue.

PHPBB3-9628
 2010-05-28 13:13:53 +02:00
Joas Schilling
160d1bfd07 [ticket/9578] ACP Posting tab is missing "Post settings" module. 
PHPBB3-9578
 2010-05-28 13:03:56 +02:00
Nils Adermann
63d172e379 Merge branch 'ticket/bantu/9545' into develop-olympus 
* ticket/bantu/9545:
  [ticket/9545] Initial forum should display active topics by default.
 2010-05-16 17:50:36 +02:00
Andreas Fischer
36c1986986 [ticket/9545] Initial forum should display active topics by default. 
The initial forum 'Your first forum' should show topics
(especially the 'Welcome to phpBB3' topic) in the active topics list after
installing phpBB because this is the default setting for new forums
(but not categories).

The default database column value for forum_flags is 32 =
FORUM_FLAG_POST_REVIEW, we therefore have to explicitly set forum_flags to
FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS = 48 for this forum.

PHPBB3-9545
 2010-05-16 17:49:06 +02:00
Nils Adermann
0f35101c49 Merge branch 'ticket/nickvergessen/9119' into develop-olympus 
* ticket/nickvergessen/9119:
  [ticket/9119] Respect language selection on automated update.
 2010-05-16 16:56:29 +02:00
Joas Schilling
d8b5594c14 [ticket/9119] Respect language selection on automated update. 
PHPBB3-9119
 2010-05-16 16:54:29 +02:00
Joas Schilling
58dc5a191c [ticket/7717] Localise default extension groups for attachments 
PHPBB3-7717
 2010-05-14 02:42:21 +02:00
Nils Adermann
568fb83373 Merge branch 'master' into develop-olympus 2010-03-06 02:29:04 +01:00
Nils Adermann
39490abfff Incrementing the version number to 3.0.7-PL1 2010-03-05 21:09:37 +01:00
Nils Adermann
872ad322ec Increment version number to 3.0.7 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-28 19:30:58 +00:00
Nils Adermann
82219d51c2 Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-24 00:08:13 +00:00
Nils Adermann
4c2421dc1e Previous version bump commit r10506 was missing schema_data.sql so that has been updated to 3.0.7-RC2 as well now 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10532 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-23 23:59:08 +00:00
Nils Adermann
47ce0f2a93 Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] 
If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-23 23:35:48 +00:00
Andreas Fischer
4f439593ce Merge r10520 into 3.0.7 branch. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-22 19:37:09 +00:00
Andreas Fischer
e8f01ff74b We have to use a 'snapshot' of the function there, because it might not be available yet. - Bug #57755 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10520 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-22 19:33:27 +00:00
Andreas Fischer
5ae48dd873 Bump version to 3.0.7-RC2. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 02:14:02 +00:00
Andreas Fischer
19da9ac065 Merge r10503, r10504 into 3.0.7 branch. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10505 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 02:13:15 +00:00
Andreas Fischer
576722cead Adding 3.0.7-RC2 to database updater 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10504 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 02:06:20 +00:00
Andreas Fischer
c02fedb6c7 Revising r10499, #57755 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10503 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 02:01:32 +00:00
Andreas Fischer
dccd529498 Merge r10497 and r10499 into 3.0.7 - #57755 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 01:40:51 +00:00
Andreas Fischer
30b83896a1 Fix Bug #57755 - Make user_email_hash() function independent from system's architecture. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10499 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 01:17:30 +00:00