mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

More PHP5 compatibility (this constructor thing order did not remove the error for me)

Browse Source 
Also be able to set $serendipity['production'] in serendipity_config_local.inc.php
This commit is contained in:
Garvin Hicking 2012-10-18 10:13:11 +02:00
parent a8ffe23890
commit 48861c5505
5 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundled-libs/Net/URL.php
View File

@ -191,16 +191,6 @@ class Net_URL
}
}
/**
* PHP4 Constructor
*
* @see __construct()
*/
function Net_URL($url = null, $useBrackets = true)
{
$this->__construct($url, $useBrackets);
}
/**
* Returns full url
*

5
bundled-libs/Onyx/RSS.php
View File

@ -84,11 +84,6 @@ class ONYX_RSS
xml_set_character_data_handler($this->parser, 'cdata');
}
function ONYX_RSS($charset = 'UTF-8')
{
$this->__construct($charset);
}
function parse($uri, $file=false, $time=false, $local=false)
{
$this->rss = array();

3
docs/NEWS
View File

@ -4,6 +4,9 @@
Version 1.7 ()
------------------------------------------------------------------------
* Onyx, Net_URL classes: Remove PHP4 style constructor due to
PHP5 error "Constructor already defined"
* Improved RSS sidebarplugin to support Atom
* Bundled simplepie

10
include/functions_config.inc.php
View File

@ -1441,7 +1441,7 @@ function serendipity_deleteGroup($groupid) {
if (!serendipity_checkPermission('adminUsersMaintainOthers')) {
// Only groups should be accessible where a user has access rights.
$my_groups =& serendipity_getGroups($serendipity['authorid'], true);
$my_groups = serendipity_getGroups($serendipity['authorid'], true);
if (!in_array($groupid, $my_groups)) {
return false;
}
@ -1543,8 +1543,8 @@ function serendipity_intersectGroup($checkuser = null, $myself = null) {
$myself = $serendipity['authorid'];
}
$my_groups =& serendipity_getGroups($myself, true);
$his_groups =& serendipity_getGroups($checkuser, true);
$my_groups = serendipity_getGroups($myself, true);
$his_groups = serendipity_getGroups($checkuser, true);
foreach($his_groups AS $his_group) {
if (in_array($his_group, $my_groups)) {
@ -1577,7 +1577,7 @@ function serendipity_updateGroupConfig($groupid, &$perms, &$values, $isNewPriv =
if (!serendipity_checkPermission('adminUsersMaintainOthers')) {
// Only groups should be accessible where a user has access rights.
$my_groups =& serendipity_getGroups($serendipity['authorid'], true);
$my_groups = serendipity_getGroups($serendipity['authorid'], true);
if (!in_array($groupid, $my_groups)) {
return false;
}
@ -2200,7 +2200,7 @@ function serendipity_hasPluginPermissions($plugin, $groupid = null) {
$forbidden = array();
if ($groupid === null) {
$groups =& serendipity_checkPermission(null, null, 'all');
$groups = serendipity_checkPermission(null, null, 'all');
} else {
$groups = array($groupid => serendipity_fetchGroup($groupid));
}

4
serendipity_config.inc.php
View File

@ -48,7 +48,9 @@ if (defined('USE_MEMSNAP')) {
$serendipity['version'] = '1.7-alpha1';
// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
if (!isset($serendipity['production'])) {
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
}
// Set error reporting
// TODO: E_STRICT throws problematic errors due to "hook_event" being a static function, but all of our plugins don't really define that...