1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

11228 Commits

Author SHA1 Message Date
Andreas Fischer
baf09125ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
2011-10-13 17:10:38 +02:00
Andreas Fischer
3a92623dfa Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympus
* nickvergessen/ticket/10408:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
2011-10-13 17:09:48 +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
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
PHPBB3-10408
2011-10-13 15:52:12 +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
76f3d08383 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
2011-09-27 20:58:17 +02:00
Andreas Fischer
dad7aa9593 Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus
* nickvergessen/ticket/10315:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
2011-09-27 20:57:55 +02: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
Andreas Fischer
5e768036f7 Merge remote-tracking branch 'cs278/ticket/10375' into develop
* cs278/ticket/10375:
  [ticket/10375] Rework $source_file setting.
  [ticket/10375] Make _tpl_load() a little leaner.
  [ticket/10375] Use existing method to generate cache file name.
2011-09-23 03:40:02 +02:00
Igor Wiedler
6c038d0499 Merge remote-tracking branch 'cs278/ticket/10152' into develop
* cs278/ticket/10152:
  [ticket/10152] Remove end '?>' from generated config.php.
2011-09-21 18:13:09 +02:00
Igor Wiedler
e41f9c9329 Merge branch 'develop' of github.com:phpbb/phpbb3 into develop
* 'develop' of github.com:phpbb/phpbb3: (44 commits)
  [ticket/10374] Remove 'custom template' cache prefix.
  [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.
  [ticket/10371] Removing last mentions of imageset
  [ticket/10370] Add function documentation for get_stacktrace().
  [ticket/10370] Explain that we are not the ones hiding backtrace pieces.
  ...
2011-09-21 18:12:07 +02: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
Chris Smith
e95aec1637 [ticket/10152] Remove end '?>' from generated config.php.
PHPBB3-10152
2011-09-21 08:36:53 +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
Joas Schilling
5b66413f69 [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
PHPBB3-10315
2011-09-21 01:02:28 +02:00
Nils Adermann
207f249521 Merge remote-tracking branch 'github-cs278/ticket/10374' into develop
* github-cs278/ticket/10374:
  [ticket/10374] Remove 'custom template' cache prefix.
2011-09-21 00:41:17 +02:00
Chris Smith
903bc5b78a [ticket/10374] Remove 'custom template' cache prefix.
PHPBB3-10374
2011-09-20 23:33:08 +01:00
Chris Smith
7b7a56dc4a [feature/remove-db-styles] Remove forgotten template variables.
PHPBB3-9741
2011-09-20 23:15:30 +01:00
Chris Smith
c184fb86c9 [feature/remove-db-styles] Removed style.php!
Finally sanity has arrived! No more delivering CSS through PHP. Better
3 years late than never.

PHPBB3-9741
2011-09-20 23:12:07 +01:00
Chris Smith
ee994b2968 [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
PHPBB3-9741
2011-09-20 23:01:55 +01:00
Chris Smith
8b21983222 [feature/remove-db-styles] Update language to reflect removal of db storage.
PHPBB3-9741
2011-09-20 22:42:52 +01:00
Chris Smith
58c3556e19 [feature/remove-db-styles] Mark log entrys as deprecated.
PHPBB3-9741
2011-09-20 22:42:17 +01:00
Chris Smith
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
Chris Smith
cb245f5d04 [feature/remove-db-styles] Add schema changes sinces 3.0.x.
PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
364a69adc2 [feature/remove-db-styles] Readd table constant for upgrades etc.
Removed in f23b224b946b37c171add5953e832641bbb3a5c3.

PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
270cd839a6 [feature/remove-db-styles] Update database schemas.
Removes:
* styles_template_data table
* template_storedb on styles_template table
* On styles_theme table:
  - theme_storedb
  - theme_mtime
  - theme_data

PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
934a9da313 [feature/remove-db-styles] Remove style.php DB storage.
Removed all use of the DB for serving/caching the theme from style.php,
acp_style no longer stores the theme modified time either.

As a consequence currently all stylesheets will be served through style.php
(with no caching) until imagesets are removed [PHPBB3-10336], then
they can we served as static files by HTTPd.

PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
b1df91db80 [feature/remove-db-styles] Remove parse_css_file option from themes.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
267daf0c39 [feature/remove-db-styles] Remove DB theme handling code from session.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
c2d6c613d3 [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
ad11565ace [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
23415170cb [feature/remove-db-styles] Removing unused methods from acp_style.
These got left behind in 6854d47.

PHPBB3-9741
2011-09-20 21:06:52 +01:00