1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Commit Graph

5070 Commits

Author SHA1 Message Date
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
2011-10-14 17:56:46 +02:00
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
2011-10-14 17:56:38 +02:00
Igor Wiedler
99d6f00d51 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
2011-10-14 17:48:15 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
2011-10-14 17:37:12 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once
PHPBB3-10414
2011-10-14 17:23:31 +02:00
Andreas Fischer
7e18d2b861 [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
PHPBB3-10327
2011-10-14 17:23:21 +02:00
Andreas Fischer
4effe8fb8b [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
PHPBB3-8240
2011-10-14 16:35:14 +02:00
Andreas Fischer
234edf674c [ticket/8240] Add ability to get a list of tables to db_tools.
PHPBB3-8240
2011-10-14 16:35:07 +02:00
Igor Wiedler
37d9e7e30c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
2011-10-14 14:35:21 +02:00
Igor Wiedler
1657339e6d Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus
* bantu/ticket/10327:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
2011-10-14 14:34:44 +02:00
Andreas Fischer
d86fccf9c9 [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
* CREATE INDEX is internally mapped to an ALTER INDEX statement.
* CREATE INDEX requires the INDEX permission.
* ALTER TABLE requires the (more powerful) ALTER permission.
* We require the ALTER permission anyway for operation.
* Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX
  permission which is good because some management software does not give
  out the INDEX permission by default.

http://dev.mysql.com/doc/refman/5.0/en/create-index.html

PHPBB3-10327
2011-10-14 14:30:51 +02:00
Igor Wiedler
14636f61d5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too

Conflicts:
	phpBB/includes/auth/auth_db.php
2011-10-14 03:56:55 +02:00
Nils Adermann
768932a3f2 [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
PHPBB3-10212
2011-10-14 03:41:52 +02:00
Nils Adermann
d68b815690 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10074] Change default value of 'Set as special rank' to No
2011-10-14 02:55:21 +02:00
Nils Adermann
d16b160d5c Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop-olympus
* github-nickvergessen/ticket/10074:
  [ticket/10074] Change default value of 'Set as special rank' to No
2011-10-14 02:55:05 +02:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:49:15 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:47:45 +02:00
Joas Schilling
1f677d5de3 [ticket/10074] Change default value of 'Set as special rank' to No
PHPBB3-10074
2011-10-14 02:41:37 +02:00
Nils Adermann
bb616b4135 [ticket/10412] Replace memory_get_usage with memory_get_peak_usage
PHPBB3-10412
2011-10-14 02:02:17 +02:00
Andreas Fischer
85407986ea Merge remote-tracking branch 'nickvergessen/ticket/10300' into develop
* nickvergessen/ticket/10300:
  [ticket/10300] Always set group attributes for teampage and legend
2011-10-13 23:48:45 +02:00
Andreas Fischer
301f9d42f7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
2011-10-13 23:45:04 +02:00
Andreas Fischer
4e69fe6859 Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympus
* igorw/ticket/10307:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
2011-10-13 23:44:42 +02:00
Andreas Fischer
1dc1583b92 [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
PHPBB3-10278
2011-10-13 18:23:33 +02:00
Andreas Fischer
091119605a [ticket/10278] Also timeout when receiving data over a slow connection.
PHPBB3-10278
2011-10-13 18:03:02 +02:00
Andreas Fischer
d5cd49f276 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10304] Fix URL for ICQ while view private messages
2011-10-13 17:07:39 +02:00
Andreas Fischer
4c1bde350a Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympus
* nickvergessen/ticket/10304:
  [ticket/10304] Fix URL for ICQ while view private messages
2011-10-13 17:07:28 +02:00
Andreas Fischer
9fbe4e34ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10400] Allow forum name to be '0'
2011-10-13 17:05:53 +02:00
Andreas Fischer
4b42646f36 Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus
* nickvergessen/ticket/10400:
  [ticket/10400] Allow forum name to be '0'
2011-10-13 17:05:01 +02:00
Igor Wiedler
3cd8c2507d [ticket/10307] Return false in mysqli sql_fetchrow on empty result
PHPBB3-10307
2011-10-13 16:43:11 +02:00
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/includes/functions.php
2011-10-13 14:46:16 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages
PHPBB3-10304
2011-10-13 13:59:39 +02:00
Igor Wiedler
330b79686a Merge remote-tracking branch 'ckwalsh/ticket/9661' into develop
* ckwalsh/ticket/9661:
  [ticket/9661] Remove eval() from functions_privmsgs.php
2011-10-10 23:58:18 +02:00
Joas Schilling
cacb9f2ec5 [ticket/10400] Allow forum name to be '0'
PHPBB3-10400
2011-10-07 09:44:31 +02:00
Vjacheslav Trushkin
b38fbc6d25 [ticket/10397] Pagination inconsistency fix
Fixing topic_generate_pagination()

PHPBB3-10397
2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
12882084d4 [ticket/10397] Pagination inconsistency fix
Fixing inconsistency in code generated by generate_pagination()

PHPBB3-10397
2011-10-04 11:55:25 +03:00
Andreas Fischer
887a9e583f Merge remote-tracking branch 'cs278/ticket/10387' into develop
* cs278/ticket/10387:
  [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
2011-09-27 20:29:03 +02:00
Andreas Fischer
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
2011-09-27 20:24:16 +02:00
Chris Smith
1f14013093 [ticket/10392] Alter parent namespace stripping.
PHPBB3-10392
2011-09-27 01:06:43 +01:00
Chris Smith
02a24e2439 [ticket/10392] Missed fix for S_BLOCK_NAME.
PHPBB3-10392
2011-09-27 00:50:53 +01:00
Chris Smith
0f589d9ce4 [ticket/10392] Fix access to nested special block variables.
PHPBB3-10392
2011-09-26 20:52:07 +01:00
Cullen Walsh
6fce68b9b6 [ticket/9661] Remove eval() from functions_privmsgs.php
Tested by sending messages to myself on a test board.

PHPBB3-9661
2011-09-25 23:04:18 -07:00
Chris Smith
ee5d585fe9 [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
PHPBB3-10387
2011-09-25 13:11:24 +01:00
Andreas Fischer
d01c028c1c Merge remote-tracking branch 'cs278/ticket/10384' into develop
* cs278/ticket/10384:
  [ticket/10384] Language variable replacements should not check for var prefix.
  [ticket/10384] Update unit tests to test for failing variable.
2011-09-24 22:21:05 +02:00
Chris Smith
e9392bbdde [ticket/10384] Language variable replacements should not check for var prefix.
PHPBB3-10384
2011-09-24 20:50:35 +01:00
Chris Smith
95d24e6fb7 [ticket/10375] Rework $source_file setting.
Only set the file if an mtime check or recompile are required.

PHPBB3-10375
2011-09-21 13:24:04 +01:00
Chris Smith
9d5e9af54b [ticket/10375] Make _tpl_load() a little leaner.
- Removed duplicate variables
- Set $source_file earlier for cache checks
- Fixed useless mtime check

PHPBB3-10375
2011-09-21 13:17:51 +01:00
Chris Smith
25aee49ca5 [ticket/10375] Use existing method to generate cache file name.
PHPBB3-10375
2011-09-21 13:17:10 +01:00
Nils Adermann
fab0ec64b3 Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into develop
* github-cs278/feature/remove-db-styles:
  [feature/remove-db-styles] Remove forgotten template variables.
  [feature/remove-db-styles] Removed style.php!
  [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
  [feature/remove-db-styles] Update language to reflect removal of db storage.
  [feature/remove-db-styles] Mark log entrys as deprecated.
  [feature/remove-db-styles] Add error if template/theme file is unwritable.
  [feature/remove-db-styles] Add schema changes sinces 3.0.x.
  [feature/remove-db-styles] Readd table constant for upgrades etc.
  [feature/remove-db-styles] Update database schemas.
  [feature/remove-db-styles] Remove style.php DB storage.
  [feature/remove-db-styles] Remove parse_css_file option from themes.
  [feature/remove-db-styles] Remove DB theme handling code from session.
  [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
  [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
  [feature/remove-db-styles] Removing unused methods from acp_style.
  [feature/remove-db-styles] Removed database storage of style components.
2011-09-21 01:09:18 +02:00