1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

13048 Commits

Author SHA1 Message Date
Bruno Ais
c8da69d9c2 [ticket/10575] Fixing non-static access to static functions get_instance
These changes should solve the strict standards error about accessing
the non-static get_instance() in a non-static way.
For that, I changed the get_instance methods to static methods.

PHPBB3-10575
2012-04-05 14:14:40 +01:00
Gabriel Anca
1c9993055a [ticket/10547] User is not logged in as admin after installation
After installing, when user clicks Login button (final installation step),
he is not logged in because there's a missing var ($data)

PHPBB3-10547
2012-04-04 23:43:10 -04:00
Andreas Fischer
0e954506c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  [ticket/10760] Use externally specified PHP_BIN if any.
2012-04-05 03:28:29 +02:00
Andreas Fischer
444fa29beb Merge remote-tracking branch 'p/ticket/10760' into develop-olympus
* p/ticket/10760:
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  [ticket/10760] Use externally specified PHP_BIN if any.
2012-04-05 03:28:16 +02:00
Oleg Pudeyev
b3525cd83c Merge branch 'ticket/10650' into develop
* ticket/10650:
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
2012-04-04 19:24:47 -04:00
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
David King
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -04:00
Rahul R
3e9711d6a4 [ticket/10650] Added checking for empty subjects
Now empty subjects will not be displayed in a
new line on the forum list.

PHPBB3-10650
2012-04-05 02:06:04 +05:30
Rahul R
7bb9e30199 [ticket/10650] Corrected intendation
Corrected the intendation of if condition.

PHPBB3-10650
2012-04-05 01:19:46 +05:30
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Oleg Pudeyev
21639d5d54 Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympus
* Fyorl/ticket/10607:
  [ticket/10607] Added 'Powered by' translation string.
2012-04-04 15:22:00 -04:00
Rahul R
08bee4c522 [ticket/10650]Added permission checking and utf8 functions
Passworded forums and ones in which user doesn't have
read access will be excluded. Also uft8 based string functions and
html encode/decode functions have been used to sanitise subject.

PHPBB3-10650
2012-04-05 00:46:23 +05:30
Rahul R
663b5f6542 [ticket/10650] Cropped subject and inserted newline
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
2012-04-05 00:46:14 +05:30
Rahul
1dd5b48434 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-05 00:46:01 +05:30
Rahul
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
Rahul
fd409c49a5 [ticket/10650] Added static sql files
Ran create_schema_files.php and added
the generated static sql files to the commit.

PHPBB3-10650
2012-04-05 00:45:39 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Oleg Pudeyev
dc63db1860 [ticket/10760] Fix numbering in php fun facts.
PHPBB3-10760
2012-04-04 11:43:59 -04:00
Oleg Pudeyev
efdd1e623e [ticket/10760] Value must be quoted as it might be two words.
PHPBB3-10760
2012-04-04 11:41:14 -04:00
Oleg Pudeyev
6536a36208 [ticket/10760] PHP is great. This commit is the proof.
PHPBB3-10760
2012-04-04 00:27:06 -04:00
Oleg Pudeyev
f2967b6669 [ticket/10760] Catch both versions of parse error output in php.
PHPBB3-10760
2012-04-04 00:01:08 -04:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Oleg Pudeyev
a0da2408e7 [ticket/10760] Account for display_errors=stderr in pre-commit hook.
With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
2012-04-03 23:18:33 -04:00
Oleg Pudeyev
b803fc4351 [ticket/10760] Quote PHP_BIN when using it.
This should make a difference on windows where paths may include spaces.

PHPBB3-10760
2012-04-03 23:14:44 -04:00
Oleg Pudeyev
786fcbf212 [ticket/10760] Use echo -e only if echo understands -e.
/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
2012-04-03 23:06:50 -04:00
Oleg Pudeyev
57209a1e68 [ticket/10760] Use externally specified PHP_BIN if any.
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
2012-04-03 23:05:15 -04:00
Oleg Pudeyev
714fafe106 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:31 -04:00
Oleg Pudeyev
14e727b834 Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus
* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
2012-04-03 20:57:24 -04:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific.
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
2012-04-04 02:51:28 +08:00
Hari Sankar R
a84b97f58e [ticket/10561] Fixed syntax error and renamed return variables.
Renamed $style_verified to $style_is_active and fixed extra ';'.

PHPBB3-10561
2012-04-03 23:15:16 +05:30
Hari Sankar R
c5481371b9 [ticket/10561] Changes made to $db->sql_fetchrow().
Changed $db->sql_fetchrow() to $db->sql_fetchfield().

PHPBB3-10561
2012-04-03 23:04:56 +05:30
Hari Sankar R
b81a5afc25 [ticket/10561] Changes made to function phpbb_style_is_active().
Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
2012-04-03 22:56:06 +05:30
Hari Sankar R
084e1ae560 [ticket/10561] All users can choose deactivated styles (fixed).
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
2012-04-03 22:15:59 +05:30
Nils Adermann
add130fa3a Merge remote-tracking branch 'github-cyberalien/ticket/10752' into develop
* github-cyberalien/ticket/10752:
  [ticket/10752] Fixes for acp_styles
  [ticket/10752] Changing private to protected variables in acp_styles
  [ticket/10752] More fixes for acp_styles
  [ticket/10752] Pass-by-reference fix for acp_styles
  [ticket/10752] Removing globals acp_styles
2012-04-03 15:45:30 +02:00
Vjacheslav Trushkin
e27326a57b [ticket/10752] Fixes for acp_styles
Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
2012-04-03 14:26:38 +03:00
Vjacheslav Trushkin
f739d7acce [ticket/10752] Changing private to protected variables in acp_styles
Changing private to protected variables in acp_styles

PHPBB3-10752
2012-04-03 01:14:14 +03:00
Vjacheslav Trushkin
57065095d5 [ticket/10754] Changing $style to $phpbb_style
Renaming global variable $style to $phpbb_style

PHPBB3-10754
2012-04-03 00:41:56 +03:00
Vjacheslav Trushkin
a46b5480e1 [ticket/10752] More fixes for acp_styles
Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes

PHPBB3-10752
2012-04-03 00:19:16 +03:00
Vjacheslav Trushkin
e558a3cb05 [ticket/10752] Pass-by-reference fix for acp_styles
Fixing pass-by-reference bug in acp_styles

PHPBB3-10752
2012-04-03 00:18:52 +03:00
Vjacheslav Trushkin
7c99525b98 [ticket/10752] Removing globals acp_styles
Removing global variables from functions in acp_styles

PHPBB3-10752
2012-04-03 00:14:30 +03:00
Vjacheslav Trushkin
8363d32765 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-02 16:20:21 +03:00
Vjacheslav Trushkin
51bc9540cf Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus
* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
2012-04-02 16:18:56 +03:00
Hari Sankar R
17e050e109 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed minor issues in formatting.

PHPBB3-10699
2012-04-02 16:59:05 +05:30
Shibu Lijack
d8c67937d6 [ticket/10734] Fixed cp css
Fixed border radius and padding of the ucp and mcp.

PHPBB-10734
2012-04-02 16:53:09 +05:30
Hari Sankar R
42101fe8d4 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
2012-04-02 16:26:23 +05:30
Shibu Lijack
3ced1d2bfc [ticket/10734] Removed all the unnecessary corner classes
Removed the corner span classes from all the template and theme files.

PHPBB-10734
2012-04-02 16:15:55 +05:30
Shibu Lijack
97ff7ee9d8 [ticket/10734] Fixed padding issues
Fixed padding for post and panel.

PHPBB-10734
2012-04-02 02:04:11 +05:30
Shibu Lijack
6498f2d33a [ticket/10734] Fixed IE7 clear float bug
Modified tweaks.css to fix IE bug

PHPBB-10734
2012-04-02 01:47:08 +05:30
Igor Wiedler
2c68dc2e6d Merge remote-tracking branch 'sadu/ticket/10438' into develop
* sadu/ticket/10438:
  [ticket/10438] Alligning the Smileys on the same line as the text.
2012-04-01 21:39:37 +02:00
Igor Wiedler
ff7a6fb204 Merge remote-tracking branch 'cyberalien/ticket/10742' into develop
* cyberalien/ticket/10742:
  [ticket/10742] Fixing table widths
2012-04-01 21:30:21 +02:00