Commit graph

17926 commits

Author SHA1 Message Date
Bruno Ais
596e9bb69d [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
2013-07-16 21:20:22 +01:00
Bruno Ais
e7bf3abd1a [ticket/11642] generate_text_for_display on mcp/mcp_post.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
2013-07-16 21:15:59 +01:00
Bruno Ais
e1e8d4ed34 [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
2013-07-16 21:01:47 +01:00
Bruno Ais
fc6bed2856 [ticket/11640] generate_text_for_display on functions_privmsgs.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
2013-07-16 20:32:57 +01:00
Joas Schilling
530b96a4b0 Merge pull request #1575 from bantu/ticket/10931
[ticket/10931] Add phpbb_php_ini as a service.
2013-07-16 11:17:06 -07:00
Andreas Fischer
792c730f15 [ticket/10931] Add phpbb_php_ini as a service.
PHPBB3-10931
2013-07-16 20:11:58 +02:00
Vjacheslav Trushkin
0759b606c2 [ticket/11708] Fix bulletin points in notifications
PHPBB3-11708
2013-07-16 20:11:28 +03:00
Bruno Ais
5f19ca6a6f [ticket/11639] Whitespace fixing
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:09:59 +01:00
Bruno Ais
dde9a1fb27 [ticket/11639] Added an useful comment.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:08:17 +01:00
Bruno Ais
f96f2a9e23 [ticket/11639] generate_text_for_display on functions_posting.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:06:54 +01:00
Marc Alexander
bc6122b64f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-07-14 16:51:46 -04:00
David King
1891e24ea6 Merge remote-tracking branch 'upstream/pr/1570' into develop
* upstream/pr/1570:
  [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
2013-07-14 16:02:09 -04:00
Joas Schilling
d8dea63778 Merge pull request #9 from igorw/ticket/11574
[ticket/11574] Fix more issues in the updater
2013-07-14 12:47:49 -07:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
2013-07-14 15:40:19 -04:00
Igor Wiedler
c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter
2013-07-14 15:27:25 -04:00
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
PHPBB3-11706
2013-07-14 15:13:09 -04:00
Nils Adermann
af69349398 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
2013-07-14 13:56:05 -04:00
Nils Adermann
8d8a0602d6 Merge pull request #1567 from bantu/ticket/11704
[ticket/11704] phing build script does not include vendor folder, even if there are dependencies
2013-07-14 10:55:32 -07:00
Andreas Fischer
da1ee75140 [ticket/11704] Use the correct directory for dependency checking.
PHPBB3-11704
2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b [ticket/11704] Correctly escape "
PHPBB3-11704
2013-07-14 19:48:41 +02:00
Joas Schilling
a9a6305d93 [ticket/11582] Fix little typo
PHPBB3-11582
2013-07-14 13:20:58 -04:00
Vjacheslav Trushkin
a68aed5119 [ticket/11688] tpl_ files are no longer used
Remove tpl_ and ctpl_ from cache->purge() because those prefixes
are no longer used.

PHPBB3-11688
2013-07-14 13:20:41 -04:00
Joas Schilling
e4a5ce307d [ticket/11582] Test the event and and fix it.
PHPBB3-11582
2013-07-14 12:55:03 -04:00
Vjacheslav Trushkin
81e0859041 [ticket/11688] Purge TWIG cache
Purge directories
Replace opendir() with DirectoryIterator

PHPBB3-11688
2013-07-14 12:11:57 -04:00
Joas Schilling
9c72bbe284 [ticket/11582] Move file to new directory
PHPBB3-11582
2013-07-14 12:04:04 -04:00
Joas Schilling
cfb13bb547 [ticket/11582] Fix extension permission tests
PHPBB3-11582
2013-07-14 12:02:48 -04:00
Joas Schilling
060754fd6c [ticket/11582] Fix missing closing bracket
PHPBB3-11582
2013-07-14 12:02:47 -04:00
Joas Schilling
4b7b7e895b [ticket/11582] Fix missing @params in the doc blocks
PHPBB3-11582
2013-07-14 12:02:46 -04:00
Joas Schilling
aaa44eda2b [ticket/11582] Remove useless prefix
PHPBB3-11582
2013-07-14 12:02:44 -04:00
Joas Schilling
4a64e2c2b3 [ticket/11582] Fix documentation for adding permissions
PHPBB3-11582
2013-07-14 12:02:43 -04:00
Joas Schilling
0e86c02473 [ticket/11582] Split permission language strings from logic
PHPBB3-11582
2013-07-14 12:02:38 -04:00
Joas Schilling
d7a85ebc24 Merge remote-tracking branch 'igorw/ticket/11574' into ticket/11574
* igorw/ticket/11574: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...
2013-07-14 11:57:53 -04:00
Joas Schilling
aadff800dc [ticket/11582] Remove left over calls to lang['acl_*']
PHPBB3-11582
2013-07-14 11:51:39 -04:00
Joas Schilling
22ba3de1a2 [ticket/11582] Use member isntead of a new variable everytime
PHPBB3-11582
2013-07-14 11:51:37 -04:00
Joas Schilling
9c653341e4 [ticket/11582] Use new methods and remove duplicated entries
PHPBB3-11582
2013-07-14 11:51:36 -04:00
Joas Schilling
ce0a182c7f [ticket/11582] Add methods to return the language string
PHPBB3-11582
2013-07-14 11:51:34 -04:00
Joas Schilling
7f9a1c8116 [ticket/11582] Add event in constructor and add docs
PHPBB3-11582
2013-07-14 11:51:33 -04:00
Joas Schilling
137cec5895 [ticket/11582] Fix event dispatcher class name
PHPBB3-11582
2013-07-14 11:51:32 -04:00
Joas Schilling
e8d2a2fd88 [ticket/11582] Use new class for categories
PHPBB3-11582
2013-07-14 11:51:30 -04:00
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
2013-07-14 11:51:29 -04:00
Andreas Fischer
58a9e975f8 Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into develop
* galaxyAbstractor/ticket/11697:
  [ticket/11697] author_search() used incorrect parameter
2013-07-14 17:41:31 +02:00
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
Joas Schilling
fa3cdb6bf2 Merge pull request #7 from igorw/ticket/11574
[ticket/11574] Fix various path issues in the updater
2013-07-14 08:20:14 -07:00
Victor Nagy
e91b465de1 [ticket/11697] author_search() used incorrect parameter
The author_search() function in fulltext_mysql.php had an argument
$m_approve_fid_ary parameter but it was changed in the Docblock
and code to $post_visibility. This change renames that argument
according to the docblock, the code and to mirror the other classes.

PHPBB3-11697
2013-07-14 11:15:01 -04:00
Andreas Fischer
c15bde161a Merge remote-tracking branch 'nickvergessen/ticket/11702' into develop
* nickvergessen/ticket/11702:
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
2013-07-14 16:59:19 +02:00
Joas Schilling
405b5e54f6 [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
PHPBB3-11702
2013-07-14 10:49:23 -04:00
Nils Adermann
3d9e57d0ce Merge pull request #1558 from nickvergessen/ticket/11696
[ticket/11696] Rename db_tools.php so it can be autoloaded
2013-07-14 07:29:29 -07:00
Joas Schilling
f302cbe175 [ticket/11696] Move file to new directory
PHPBB3-11696
2013-07-14 10:16:15 -04:00
Joas Schilling
131194d216 [ticket/11696] Rename constructor to __construct()
PHPBB3-11696
2013-07-14 10:12:49 -04:00
Joas Schilling
5d4c443c2d [ticket/11696] Remove manual loading of db_tools in extension controller test
Remember to store the file, before commiting it...

PHPBB3-11696
2013-07-14 10:10:05 -04:00