mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity
10,883 Commits 2 Branches 22 Tags
771f04702b01cbf39f0468d88df1d5e50153baf3
Commit Graph

10883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron
45de0a49f3 PHP Notice removal 2018-07-22 13:03:06 -07:00
Achim Ennenbach
d3ee6b5fbb fixed wrong link to CONTRIBUTING.md 2018-07-22 21:27:06 +02:00
Achim Ennenbach
67ced370d3 make sure backcompat.css is loaded if it's legacy or no bootstrap theme 2018-07-22 21:24:06 +02:00
Cameron
e231a19ab9 Issue #3306 2018-07-22 11:43:13 -07:00
Cameron
17760d975c Added comment about set_urls() 2018-07-22 11:39:56 -07:00
Gábor
d0a4693570 Update theme.php 2018-07-22 20:11:04 +02:00
Gábor
41e512c968 Update lan_theme.php 2018-07-22 20:09:14 +02:00
Gábor
a747a76c5f Update theme.php 2018-07-22 20:01:45 +02:00
Gábor
94b0f9c945 Update lan_theme.php 2018-07-22 20:00:41 +02:00
Cameron
262dc7f36b Closes #3305 Added a backward compatibility fix for buggy array storage data. 2018-07-22 10:39:01 -07:00
Cameron
9697e114b1 Closes #3302 2.1.8-2.1.9 update entry added. 2018-07-22 09:43:33 -07:00
Cameron
b9e0dd0a7a Merge pull request #3306 from Deltik/fix-249be29 
Removed problematic cache from e107plugin::getinfo() and fixed regression in e_core_pref::__construct()
 2018-07-22 09:38:31 -07:00
Cameron
56d5bcafd7 Revert the revert :-) 2018-07-22 09:36:23 -07:00
Nick Liu
044ed7c5be Fixed regression in e_core_pref::__construct() 
e_core_pref::load() does not behave in the way I expected it to…

See: https://github.com/e107inc/e107/pull/3301
 2018-07-22 11:32:52 -05:00
Nick Liu
3d206306fe Revert "Issue #3301 Revert "Removed problematic cache from e107plugin::getinfo()"" 
This reverts commit 55be7e35a2.
 2018-07-22 11:32:26 -05:00
Nick Liu
0d8d15c8a5 Merge branch 'master' into fix-249be29 2018-07-22 11:31:32 -05:00
Nick Liu
9d1bb3f7c3 Fixed regression in e_core_pref::__construct() 
e_core_pref::load() does not behave in the way I expected it to…

See: https://github.com/e107inc/e107/pull/3301
 2018-07-22 11:21:18 -05:00
Gábor
1b7436d3b7 Update lan_admin.php 2018-07-22 16:04:34 +02:00
Gábor
31d9b383d4 Update admin.php 2018-07-22 16:02:03 +02:00
Cameron
f430f56082 Media-picker styling. 2018-07-21 13:56:13 -07:00
Cameron
7d040347d0 Make video/audio thumbnails larger. 2018-07-21 13:20:17 -07:00
Cameron
eef624c93b Send a 500 error response code when thumb.php fails due to an exception. 2018-07-21 13:07:44 -07:00
Cameron
55be7e35a2 Issue #3301 Revert "Removed problematic cache from e107plugin::getinfo()" 
This reverts commit 89e28e38c5 because it breaks thumb.php
 2018-07-21 12:23:44 -07:00
Cameron
8c2bf18679 Merge pull request #3301 from Deltik/fix-249be29 
Removed problematic cache from e107plugin::getinfo()
 2018-07-21 10:24:09 -07:00
Cameron
f50860a51e Preparation for 2.1.9 upgrade routine. 2018-07-21 10:18:16 -07:00
Cameron
0cc458e4e8 Fixes #3290, Fixes #3074 - Featurebox debug message was visible to public. 2018-07-21 10:08:13 -07:00
Nick Liu
89e28e38c5 Removed problematic cache from e107plugin::getinfo() 
Every known usage of e107plugin::getinfo() requires up-to-date knowledge
of the involved plugin's record in the database.

For this reason, I removed the object scope global state caching of
results from e107plugin::getinfo()

Also changed the method name to a more descriptive getPluginRecord()

Also made e107plugin::getPluginRecord() static
 2018-07-21 12:08:00 -05:00
Cameron
91b49cd293 Merge pull request #3300 from SimSync/fix_3244 
fixes #3244 "&" in url definition was broken during parse_str()
 2018-07-21 09:15:23 -07:00
Cameron
ed2e86b10f Merge pull request #3299 from SimSync/fix_3249 
Fix #3249 uc_select() didn't recognize comma separated values
 2018-07-21 09:14:26 -07:00
Achim Ennenbach
5f0ee53c00 fixes #3244 "&" in url definition was broken during parse_str() 2018-07-21 11:44:42 +02:00
Achim Ennenbach
774e51ff13 fixes #3249 uc_select() didn't recognize comma separated values 
added a check for such values
 2018-07-21 10:20:40 +02:00
Achim Ennenbach
09e3b4aeb6 fixes #3249 uc_select() didn't recognize comma separated values 
added a check for such values
 2018-07-21 10:19:04 +02:00
Cameron
4773186a50 Small correction in plugin install/uninstall log. 2018-07-20 12:58:49 -07:00
Cameron
26fe2d4216 Merge pull request #3297 from SimSync/dbupdate_featurebox 
Fixes the "dbupdate after a clean install" issue
 2018-07-20 12:56:47 -07:00
Achim Ennenbach
2990b57485 Fixes the "dbupdate after a clean install" issue 
The "isset" statement tested on a key in array "core_plugins", but the keys of that array were numeric.
So the "isset" was always false and the statements within the if clause were always executed.
That resulted for some reason in a "false positive" on the "featurebox" plugin, in case was not installed at this moment.
 2018-07-20 21:25:40 +02:00
Cameron
aeb7f17948 Merge pull request #3293 from SimSync/fix_3285 
fixes #3285 No rank images displayed in backend and on profile page
 2018-07-20 11:38:12 -07:00
Cameron
c02a7dcb61 Merge pull request #3296 from Deltik/fix-test-6 
Reduce reliance on global var $db_ConnectionID
 2018-07-20 11:37:46 -07:00
Nick Liu
e17b894dff Excluded ".sc" files for Code Climate 
./e107_core/shortcodes/single/search.sc seems to be breaking Code
Climate builds

Also corrected an indentation problem in .codeclimate.yml
 2018-07-20 05:47:42 -05:00
Nick Liu
3407b717c6 Reduce reliance on global var $db_ConnectionID 
When one of the 11 methods in e_db_mysql look for a PDO object in
e_db_mysql::$mySQLaccess, global $db_ConnectionID can be NULL in some
cases, so it's more reliable to get the singleton e_db_mysql and use the
e_db_mysql::$mySQLaccess from that singleton.

This change still allows global $db_ConnectionID to be used, but if
$db_ConnectionID is NULL, the singleton fallback is used.

Fixes: e107inc/e107-test#6
 2018-07-20 05:24:55 -05:00
Cameron
b42e91217f Provide a default USERCLASS_LIST value while running in CLI mode. 2018-07-19 20:49:16 -07:00
Cameron
cd8ddfd54a Issue #3200 - Media-Manager Media-picker work-in-progress 2018-07-19 12:43:04 -07:00
Achim Ennenbach
cf9c222879 fixes #3285 No rank images displayed in backend and on profile page 2018-07-19 17:08:55 +02:00
Cameron
6ab8c5c0f3 Issue #3200 More work on Media-picker. Version changed to 2.1.9 (git) 2018-07-18 14:40:29 -07:00
Miro Yovchev
4264dc6f66 Make print great again! v2.1.8 2018-07-18 13:53:51 +03:00
Cameron
bb7f8717fa Media-Manager Issue #3200 Work in Progress. Local video-file browser. 2018-07-16 17:14:10 -07:00
Cameron
bac96528fc Token fix. 2018-07-16 12:39:32 -07:00
Cameron
1ad363881a Merge pull request #3206 from oudoken/master 
Fixes #3150 Allow logged in user to view email address.
 2018-07-16 11:54:53 -07:00
Cameron
327bee29cd Merge pull request #3287 from SimSync/userprofile_legacyurl 
Fixed issue with legacy url (goto settings) on user profile page
 2018-07-15 12:22:29 -07:00
Cameron
91374a0dde Merge pull request #3286 from SimSync/plugin_update_files 
Added buildAddonPrefLists() to plugin install, update and uninstall
 2018-07-15 12:21:49 -07:00
Cameron
62b257e655 Merge pull request #3284 from SimSync/fix_2912 
Closes #2912 Typo prevents removing admin status from user
 2018-07-15 12:21:02 -07:00