makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 18:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
13333 commits 18 branches 192 tags 207 MiB
Commit graph

13333 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
0df7e5eefa [ticket/10370] Ease up code checking for arguments of include etc. 
PHPBB3-10370
 2011-09-19 17:37:10 +02:00
Andreas Fischer
12530a763b [ticket/10370] Use unset() on the first backtrace instead of checking in loop. 
PHPBB3-10370
 2011-09-19 16:58:25 +02:00
Andreas Fischer
9c0f75fd65 [ticket/10370] Use phpbb_filter_root_path() in get_backtrace(). 
PHPBB3-10370
 2011-09-19 16:57:09 +02:00
Nils Adermann
d0f5b527fe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
 2011-09-18 23:25:57 +02:00
Nils Adermann
410028eecf Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus 
* github-bantu/ticket/10245:
  [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().
 2011-09-18 23:25:04 +02:00
Nils Adermann
2731e5a456 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10369] Replace root path with "[ROOT]" as per IRC.
  [ticket/10369] Add warning about paths outside of phpBB root not being filtered
  [ticket/10369] Rename filter_errfile() to filter_root_path().
  [ticket/10369] DRY code to remove phpbb path from errfile.
  [ticket/10369] Always include errfile and errline in format_errors().
 2011-09-18 23:24:13 +02:00
Nils Adermann
94fead702a Merge remote-tracking branch 'github-bantu/ticket/10369' into develop-olympus 
* github-bantu/ticket/10369:
  [ticket/10369] Replace root path with "[ROOT]" as per IRC.
  [ticket/10369] Add warning about paths outside of phpBB root not being filtered
  [ticket/10369] Rename filter_errfile() to filter_root_path().
  [ticket/10369] DRY code to remove phpbb path from errfile.
  [ticket/10369] Always include errfile and errline in format_errors().
 2011-09-18 23:20:45 +02:00
Andreas Fischer
1b390f0b49 [ticket/10369] Replace root path with "[ROOT]" as per IRC. 
PHPBB3-10369
 2011-09-18 23:03:28 +02:00
Andreas Fischer
c8564e6ce9 [ticket/10369] Add warning about paths outside of phpBB root not being filtered 
PHPBB3-10369
 2011-09-18 22:41:02 +02:00
Andreas Fischer
1ad97424a4 [ticket/10369] Rename filter_errfile() to filter_root_path(). 
PHPBB3-10369
 2011-09-18 22:32:25 +02:00
Nils Adermann
bf5d453479 Merge remote-tracking branch 'github-noxwizard/ticket/10322' into develop 
* github-noxwizard/ticket/10322:
  [ticket/10322] Separate template varref resolution from output generation
  [ticket/10322] Dynamic template include test
  [ticket/10322] Fix dynamic template includes
 2011-09-18 22:27:22 +02:00
Andreas Fischer
9006984d5a [ticket/10369] DRY code to remove phpbb path from errfile. 
PHPBB3-10369
 2011-09-18 22:24:14 +02:00
Andreas Fischer
7b3f6cb219 [ticket/10369] Always include errfile and errline in format_errors(). 
We remove the phpBB root path from errfile. This is consistent with how
msg_handler handles E_WARNING messages etc.

PHPBB3-10369
 2011-09-18 22:23:41 +02:00
Andreas Fischer
05515e0510 [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean(). 
PHPBB3-10245
 2011-09-18 22:04:34 +02:00
Andreas Fischer
054947adc0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
 2011-09-17 23:34:44 +02:00
Andreas Fischer
eb8b1c333f Merge remote-tracking branch 'galaxyAbstractor/ticket/10324' into develop-olympus 
* galaxyAbstractor/ticket/10324:
  [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
 2011-09-17 23:34:30 +02:00
galaxyAbstractor
94a0b7ef2e [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme 
Replaced the deprecated align and width attributes with CSS.

PHPBB3-10324
 2011-09-17 21:59:11 +02:00
Patrick Webster
b5a79009ce [ticket/10322] Separate template varref resolution from output generation 
Most template variables can now have their PHP variable name resolved instead
of only compiling directly. This allows for the use of block vars in INCLUDE
statements. This does not work for language variables since they require
multiple checks. Added tests for the new types of allowed INCLUDEs.

PHPBB3-10322
 2011-09-16 01:46:42 -05:00
Igor Wiedler
47bb42e2f0 Merge remote-tracking branch 'VSEphpbb/ticket/10362' into develop 
* VSEphpbb/ticket/10362:
  [ticket/10362] Revert subsilver2 changes
  [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors
 2011-09-14 10:27:52 +02:00
Igor Wiedler
45cf80038b Merge remote-tracking branch 'nickvergessen/ticket/10360' into develop 
* nickvergessen/ticket/10360:
  [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-09-14 10:16:55 +02:00
Matt Friedman
b8da68385e [ticket/10362] Revert subsilver2 changes 
If subsilver2 will remain at XHTML then we do not need to make any
changes to its files.

PHPBB3-10362
 2011-09-13 21:12:34 -07:00
Matt Friedman
3f61075a15 [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors 
When validating for HTML5, the name attribute is obsolete/deprecated
when used in anchor tags. The ID tag should be used here instead.

PHPBB3-10362
 2011-09-11 17:04:47 -07:00
Joas Schilling
5148358429 [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632 
I removed the fix of the original ticket and rebuild it with its own css class.
This also fixes the problem with the screwed up UCP Attachments page.

PHPBB3-6632
PHPBB3-10360
 2011-09-11 02:03:32 +02:00
Patrick Webster
b5ecb2f7a8 [ticket/10322] Dynamic template include test 
PHPBB3-10322
 2011-09-08 17:54:59 -05:00
Patrick Webster
fbec7c9b2b [ticket/10322] Fix dynamic template includes 
Dynamic template includes from variables was not implemented in the new
templating system.

PHPBB3-10322
 2011-09-08 16:51:22 -05:00
Igor Wiedler
5797de767e Merge remote-tracking branch 'bantu/ticket/10359' into develop 
* bantu/ticket/10359:
  [ticket/10359] Also include utf_tools in style.php because of request class.
 2011-09-08 23:45:34 +02:00
Andreas Fischer
d24917bcba [ticket/10359] Also include utf_tools in style.php because of request class. 
PHPBB3-10359
 2011-09-08 23:34:18 +02:00
Andreas Fischer
56bd8f27cd Merge remote-tracking branch 'igorw/ticket/10359' into develop 
* igorw/ticket/10359:
  [ticket/10359] Fix phpbb_request regression in download/file.php
 2011-09-08 23:02:22 +02:00
Igor Wiedler
34bc0427df [ticket/10359] Fix phpbb_request regression in download/file.php 
The phpbb_request object, utf-8 tools and request_var injection are missing.

PHPBB3-10359
 2011-09-08 22:37:19 +02:00
Andreas Fischer
b21cee731a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
 2011-09-06 00:44:19 +02:00
Andreas Fischer
92373e6d46 Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus 
* bantu/ticket/10294:
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
 2011-09-06 00:43:10 +02:00
Andreas Fischer
d28ec48675 Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus 
* Noxwizard/ticket/10351:
  [ticket/10351] Fix Oracle's sql_column_remove()
 2011-09-06 00:42:48 +02:00
Andreas Fischer
3801101f3b Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympus 
* Noxwizard/ticket/10352:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
 2011-09-06 00:42:40 +02:00
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop 
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
 2011-09-05 06:03:19 -04:00
Oleg Pudeyev
367fe0b4cf Merge remote-tracking branch 'cyberalien/ticket/10350' into develop 
* cyberalien/ticket/10350:
  [ticket/10350] Script for testing eval renderer
  [ticket/10350] Fix for class phpbb_template_renderer_eval
 2011-09-05 05:21:19 -04:00
Vjacheslav Trushkin
d8f4f92dae [ticket/10350] Script for testing eval renderer 
Script for testing eval renderer (fixed)

PHPBB3-10350
 2011-09-05 11:57:18 +03:00
Igor Wiedler
bbb10f576f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10354] Include cache directory path in unwritable message.

Conflicts:
	tests/template/template_test.php
 2011-09-05 09:20:06 +02:00
Igor Wiedler
4e2437a6c1 Merge remote-tracking branch 'p/ticket/10354' into develop-olympus 
* p/ticket/10354:
  [ticket/10354] Include cache directory path in unwritable message.
 2011-09-05 09:14:30 +02:00
Igor Wiedler
3048fcf4b8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10240] Added optionset to mock_user in the tests.
  [ticket/10240] Fixed copyright year in censor_text_test.php.
  [ticket/10240] Fixed censor_text test assetEquals param order.
  [ticket/10240] Added censor_text tests for special characters.
  [ticket/10240] Added censor_text tests.

Conflicts:
	tests/mock/cache.php
 2011-09-05 09:14:06 +02:00
Igor Wiedler
85bdc65df1 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus 
* callumacrae/ticket/10240:
  [ticket/10240] Added optionset to mock_user in the tests.
  [ticket/10240] Fixed copyright year in censor_text_test.php.
  [ticket/10240] Fixed censor_text test assetEquals param order.
  [ticket/10240] Added censor_text tests for special characters.
  [ticket/10240] Added censor_text tests.
 2011-09-05 09:07:52 +02:00
Igor Wiedler
6f9df6199c Merge remote-tracking branch 'p/ticket/10355' into develop 
* p/ticket/10355:
  [ticket/10355] Correctly end output buffering in template tests.
 2011-09-05 08:51:17 +02:00
Oleg Pudeyev
93b892d24a Merge remote-tracking branch 'bantu/ticket/9474' into develop 
* bantu/ticket/9474:
  [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
 2011-09-05 02:53:13 -04:00
Oleg Pudeyev
dce62b5271 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:48:54 -04:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus 
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:42:41 -04:00
Oleg Pudeyev
511f2e0435 [ticket/10355] Correctly end output buffering in template tests. 
This code was copied verbatim from develop-olympus.

PHPBB3-10355
 2011-09-05 02:07:44 -04:00
Oleg Pudeyev
1061e881bd [ticket/10354] Include cache directory path in unwritable message. 
When template tests are skipped because cache directory is not
writable, include path to the cache directory into the message
saying it is not writable.

PHPBB3-10354
 2011-09-05 01:20:57 -04:00
Patrick Webster
5c7f5f0516 [ticket/10352] Add missing break for Oracle's sql_table_drop() 
PHPBB3-10352
 2011-09-04 20:31:34 -05:00
Patrick Webster
d938d5d399 [ticket/10351] Fix Oracle's sql_column_remove() 
The correct syntax is DROP COLUMN.

PHPBB3-10351
 2011-09-04 20:22:36 -05:00
Vjacheslav Trushkin
0cb539ed72 [ticket/10350] Fix for class phpbb_template_renderer_eval 
Fixing bug in class phpbb_template_renderer_eval

PHPBB3-10350
 2011-09-04 23:25:54 +03:00
Vjacheslav Trushkin
3e76f74688 [feature/remove-imagesets] Script for converting imageset to css 
Removing imagesets. Script for converting imageset to css

PHPBB3-10336
 2011-09-04 11:05:30 +03:00