mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
17,655 Commits 17 Branches 190 Tags
Commit Graph

15621 Commits

Author SHA1 Message Date
Nathaniel Guse
2d764ef7d5 [ticket/11701] Fix regex for appending |length 
PHPBB3-11701
 2013-07-23 09:27:32 -05:00
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check 
PHPBB3-11701
 2013-07-23 09:26:50 -05:00
Nathaniel Guse
0d31420ae0 [ticket/11701] Remove useless str_replace 
PHPBB3-11701
 2013-07-23 09:25:58 -05:00
Nathaniel Guse
6b0b0f2a9f [ticket/11701] Loop variables are not passed correctly to events 
PHPBB3-11701
 2013-07-23 09:25:57 -05:00
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop 
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
 2013-07-23 04:24:05 +02:00
Andreas Fischer
017d809e74 Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop 
* nickvergessen/ticket/11733:
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
 2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed 
PHPBB3-11733
 2013-07-23 00:59:51 +02:00
Andreas Fischer
c2d919f12d Merge remote-tracking branch 'asperous/ticket/11731' into develop 
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
 2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector 
PHPBB3-11731
 2013-07-22 15:04:30 -07:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility 
PHPBB3-11728
 2013-07-22 22:54:55 +02:00
Nathan Guse
127ee62edd Merge pull request #1589 from marc1706/ticket/11717 
[ticket/11717] Use topic_posts_approved instead of topic_replies
 2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582 
Ticket/11582 Split permission logic from translations
 2013-07-22 11:28:55 -07:00
Joas Schilling
0f70864624 [ticket/11582] Move global declaration to beginning of block 
PHPBB3-11582
 2013-07-22 20:06:30 +02:00
Andreas Fischer
0f18ff6228 Merge remote-tracking branch 'marc1706/ticket/11725' into develop 
* marc1706/ticket/11725:
  [ticket/11725] Use new paths for phpbb_class_loader in file.php
 2013-07-22 18:30:59 +02:00
Marc Alexander
128af41a7c [ticket/11725] Use new paths for phpbb_class_loader in file.php 
In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to
"{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed
in all files that use it.

PHPBB3-11725
 2013-07-22 12:47:32 +02:00
Marc Alexander
effafa4b4d [ticket/11717] Add 'has' to boolean variable and reduce line length 
PHPBB3-11717
 2013-07-22 10:42:46 +02:00
Andreas Fischer
570e21285b [ticket/11722] Remove reference assignment for $captcha in report.php 
PHPBB3-11722
 2013-07-22 03:30:27 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop 
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
 2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:51:03 +02:00
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:50:49 +02:00
Andreas Fischer
148df3607b Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-release-3.0.12 
* marc1706/ticket/11720-prep-release:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:32:35 +02:00
Marc Alexander
56df3fd8ca [ticket/11720] Do not call $captcha->validate if $captcha is not set 
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies 
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
 2013-07-20 21:21:36 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected 
PHPBB3-11707
 2013-07-19 14:12:28 -05:00
Nathaniel Guse
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF 
PHPBB3-11718
 2013-07-19 13:08:41 -05:00
Marc Alexander
f421c082f7 [ticket/11713] Do not remove module if it couldn't be deleted 
Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
 2013-07-18 22:41:23 +02:00
Andreas Fischer
29322e85ff Merge remote-tracking branch 'cyberalien/ticket/11712' into develop 
* cyberalien/ticket/11712:
  [ticket/11712] Fixing typo in editor.js
 2013-07-18 18:14:03 +02:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js 
PHPBB3-11712
 2013-07-18 19:10:36 +03:00
Joas Schilling
32ffae605f Merge remote-tracking branch 'cyberalien/ticket/11708' into develop 
* cyberalien/ticket/11708:
  [ticket/11708] Fix bulletin points in notifications
 2013-07-17 00:32:59 +02: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
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar 
PHPBB3-11706
 2013-07-14 15:13:09 -04:00
Joas Schilling
e4a5ce307d [ticket/11582] Test the event and and fix it. 
PHPBB3-11582
 2013-07-14 12:55:03 -04:00
Joas Schilling
9c72bbe284 [ticket/11582] Move file to new directory 
PHPBB3-11582
 2013-07-14 12:04:04 -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
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
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
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