mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-23 06:33:22 +02:00
Code Issues Releases Wiki Activity

Issue #1356 - PHP7 Fixes.

Browse Source
This commit is contained in:
Cameron
2016-02-14 12:15:55 -08:00
parent 32636ec39d
commit 486f3d4961
54 changed files with 205 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/download_shortcodes.php
View File

@@ -452,7 +452,7 @@ SC_BEGIN DOWNLOAD_CATEGORY_SELECT
// Its a structured display option - need a 2-step process to create a tree
$catlist = array();
while ($row = $sql->db_Fetch(MYSQL_ASSOC))
while ($row = $sql->db_Fetch())
{
$tmp = $row['download_category_parent'];
if ($tmp == '0')

6
e107_core/url/user/url.php
View File

@@ -40,7 +40,7 @@ class core_user_url extends eUrlConfig
* - login/index (or just 'login') -> login.php
* - register/index (or just 'register') -> signup.php
*/
public function create($route, $params = array())
public function create($route, $params = array(), $options = array())
{
if(!$params) return 'user.php';
@@ -115,8 +115,8 @@ class core_user_url extends eUrlConfig
return $admin;
}
public function parse($pathInfo)
public function parse($pathInfo, $params = array(), $request = NULL, $router = NULL, $config = array())
{
// this config doesn't support parsing, it's done by the module entry script (news.php)
// this means News are not available via single entry point if this config is currently active

43
e107_core/xml/default_install.xml
View File

@@ -513,7 +513,8 @@ City, State, Country
<field name="media_cat_owner">_common</field>
<field name="media_cat_category">_common_image</field>
<field name="media_cat_title">(Common Images)</field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -523,7 +524,8 @@ City, State, Country
<field name="media_cat_owner">_common</field>
<field name="media_cat_category">_common_file</field>
<field name="media_cat_title">(Common Files)</field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Media in this category will be available in all areas of admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -533,7 +535,8 @@ City, State, Country
<field name="media_cat_owner">news</field>
<field name="media_cat_category">news</field>
<field name="media_cat_title">News</field>
<field name="media_cat_diz">Will be available in the news area. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Will be available in the news area.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">1</field>
@@ -543,7 +546,8 @@ City, State, Country
<field name="media_cat_owner">page</field>
<field name="media_cat_category">page</field>
<field name="media_cat_title">Custom Pages</field>
<field name="media_cat_diz">Will be available in the custom pages area of admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Will be available in the custom pages area of admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -553,6 +557,7 @@ City, State, Country
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_image</field>
<field name="media_cat_title">Download Images</field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
@@ -563,6 +568,7 @@ City, State, Country
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_thumb</field>
<field name="media_cat_title">Download Thumbnails</field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
@@ -573,6 +579,7 @@ City, State, Country
<field name="media_cat_owner">download</field>
<field name="media_cat_category">download_file</field>
<field name="media_cat_title">Download Files</field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz"></field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
@@ -583,7 +590,8 @@ City, State, Country
<field name="media_cat_owner">news</field>
<field name="media_cat_category">news_thumb</field>
<field name="media_cat_title">News Thumbnails (Legacy)</field>
<field name="media_cat_diz">Legacy news thumbnails. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Legacy news thumbnails.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">1</field>
@@ -593,7 +601,8 @@ City, State, Country
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_16</field>
<field name="media_cat_title">Icons 16px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Available where icons are used in admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -603,7 +612,8 @@ City, State, Country
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_32</field>
<field name="media_cat_title">Icons 32px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Available where icons are used in admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -613,7 +623,8 @@ City, State, Country
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_48</field>
<field name="media_cat_title">Icons 48px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Available where icons are used in admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -623,7 +634,8 @@ City, State, Country
<field name="media_cat_owner">_icon</field>
<field name="media_cat_category">_icon_64</field>
<field name="media_cat_title">Icons 64px</field>
<field name="media_cat_diz">Available where icons are used in admin. </field>
<field name="media_cat_sef"></field>
<field name="media_cat_diz">Available where icons are used in admin.</field>
<field name="media_cat_class">253</field>
<field name="media_cat_image"></field>
<field name="media_cat_order">0</field>
@@ -1080,6 +1092,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">253</field>
@@ -1091,6 +1104,7 @@ City, State, Country
<field name="userclass_visibility">253</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">246</field>
@@ -1102,6 +1116,7 @@ City, State, Country
<field name="userclass_visibility">254</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">254</field>
@@ -1113,6 +1128,7 @@ City, State, Country
<field name="userclass_visibility">253</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">248</field>
@@ -1124,6 +1140,7 @@ City, State, Country
<field name="userclass_visibility">253</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">249</field>
@@ -1135,6 +1152,7 @@ City, State, Country
<field name="userclass_visibility">253</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">1</field>
@@ -1146,6 +1164,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">247</field>
@@ -1157,6 +1176,7 @@ City, State, Country
<field name="userclass_visibility">254</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">250</field>
@@ -1168,6 +1188,7 @@ City, State, Country
<field name="userclass_visibility">253</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">0</field>
@@ -1179,6 +1200,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">252</field>
@@ -1190,6 +1212,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">255</field>
@@ -1201,6 +1224,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
<item>
<field name="userclass_id">251</field>
@@ -1212,6 +1236,7 @@ City, State, Country
<field name="userclass_visibility">0</field>
<field name="userclass_type">0</field>
<field name="userclass_icon"></field>
<field name="userclass_perms"></field>
</item>
</dbTable>
</database>