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

Port of patch #16 to 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2013-05-06 09:47:19 +02:00
parent b543fae655
commit 5ec7481030
17 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/admin/category.inc.php
View File

@ -54,7 +54,7 @@ if (isset($_POST['SAVE']) && serendipity_checkFormToken()) {
WHERE categoryid = ". (int)$parentid);
$data['subcat'] = sprintf(ALREADY_SUBCATEGORY, htmlspecialchars($r[0]['category_name']), htmlspecialchars($name));
} else {
serendipity_updateCategory($serendipity['GET']['cid'], $name, $desc, $authorid, $icon, $parentid, $serendipity['POST']['cat']['sort_order'], $serendipity['POST']['cat']['hide_sub']);
serendipity_updateCategory($serendipity['GET']['cid'], $name, $desc, $authorid, $icon, $parentid, $serendipity['POST']['cat']['sort_order'], $serendipity['POST']['cat']['hide_sub'], $admin_category);
serendipity_ACLGrant($serendipity['GET']['cid'], 'category', 'read', $serendipity['POST']['cat']['read_authors']);
serendipity_ACLGrant($serendipity['GET']['cid'], 'category', 'write', $serendipity['POST']['cat']['write_authors']);
}

2
include/admin/importers/blogger.inc.php
View File

@ -184,7 +184,7 @@ class Serendipity_Import_Blogger extends Serendipity_Import {
'realname' => $author,
'username' => $author,
'userlevel' => 0,
'password' => md5($defaultpass))
'password' => md5($this->data['defaultpass']))
);
$authorid = serendipity_db_insert_id('authors', 'authorid');
$authorList[$authorid] = $author;

3
include/admin/importers/livejournal.inc.php
View File

@ -156,9 +156,8 @@ class Serendipity_Import_LiveJournalXML extends Serendipity_Import {
}
function gatherComments($entrydata) {
$comments;
$comments = array();
if (is_array($entrydata['children'])) {
$comments = array();
foreach($entrydata['children'] AS $idx3 => $commententry) {
if ($commententry['tag'] == 'comment' && is_array($commententry['children'])) {
$comment = array(

3
include/db/sqlrelay.inc.php
View File

@ -387,7 +387,6 @@ function serendipity_db_limit_sql($limitstring) {
case "mysql":
return ' LIMIT ' . $limitstring;
case "postgresql":
$limit;
$limit_split = explode(',', $limitstring);
if (count($limit_split) > 1) {
$limit = ' LIMIT ' . $limit_split[0] . ' OFFSET ' . $limit_split[1];
@ -510,7 +509,7 @@ function serendipity_db_schema_import($query) {
*/
function serendipity_db_probe($hash, &$errs) {
global $serendipity;
$c;
$c = null;
if (!function_exists('sqlrcon_alloc')) {
$errs[] = 'No sql_relay extension found. Please check your webserver installation or contact your systems administrator regarding this problem.';

2
include/functions.inc.php
View File

@ -1072,7 +1072,7 @@ function serendipity_addCategory($name, $desc, $authorid, $icon, $parentid) {
* @param int The new category subcat hiding
* @return null
*/
function serendipity_updateCategory($cid, $name, $desc, $authorid, $icon, $parentid, $sort_order = 0, $hide_sub = 0) {
function serendipity_updateCategory($cid, $name, $desc, $authorid, $icon, $parentid, $sort_order = 0, $hide_sub = 0, $admin_category = '') {
global $serendipity;
$query = "UPDATE {$serendipity['dbPrefix']}category

17
include/functions_images.inc.php
View File

@ -52,7 +52,7 @@ function serendipity_isActiveFile($file) {
* @param boolean Apply strict directory checks, or include subdirectories?
* @return array Resultset of images
*/
function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order = false, $ordermode = false, $directory = '', $filename = '', $keywords = '', $filter = array(), $strict_directory = false) {
function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $order = false, $ordermode = false, $directory = '', $filename = '', $keywords = '', $filter = array(), $strict_directory = false) {
global $serendipity;
$cond = array(
@ -1132,7 +1132,7 @@ function serendipity_syncThumbs($deleteThumbs = false) {
if ($tdim['noimage']) {
// Delete it so it can be regenerated
if (@unlink($fthumb)) {
printf(DELETE_THUMBNAIL . "<br />\n", $sthumb);
printf(DELETE_THUMBNAIL . "<br />\n", $sThumb);
$i++;
}
} else {
@ -1144,7 +1144,7 @@ function serendipity_syncThumbs($deleteThumbs = false) {
// This thumbnail is incorrect; delete it so
// it can be regenerated
if (@unlink($fthumb)) {
printf(DELETE_THUMBNAIL . "<br />\n", $sthumb);
printf(DELETE_THUMBNAIL . "<br />\n", $sThumb);
$i++;
}
}
@ -2257,7 +2257,6 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
$dprops = explode(';', $serendipity['mediaProperties']);
$keywords = explode(';', $serendipity['mediaKeywords']);
$now = serendipity_serverOffsetHour();
$show = array();
foreach($new_media AS $idx => $media) {
$props =& serendipity_fetchMediaProperties($media['image_id']);
@ -2287,7 +2286,7 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
return serendipity_showMedia(
$show,
$mirror,
$url,
'',
false,
1,
false,
@ -2399,7 +2398,7 @@ function serendipity_parseMediaProperties(&$dprops, &$keywords, &$media, &$props
if (empty($val)) {
switch($parts[0]) {
case 'DATE':
$default_iptc_val = $now;
$default_iptc_val = serendipity_serverOffsetHour();
case 'RUN_LENGTH':
if (!isset($default_iptc_val)) {
@ -2533,7 +2532,7 @@ function serendipity_mediaTypeCast($key, $val, $invert = false) {
* @return array array('image_id') holding the last created thumbnail for immediate processing
*
*/
function serendipity_insertMediaProperty($property_group, $property_subgroup = '', $image_id, &$media, $use_cast = true) {
function serendipity_insertMediaProperty($property_group, $property_subgroup, $image_id, &$media, $use_cast = true) {
global $serendipity;
serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}mediaproperties
@ -2562,7 +2561,7 @@ function serendipity_insertMediaProperty($property_group, $property_subgroup = '
VALUES (%d, '%s', '%s', '%s', '%s')",
$image_id,
serendipity_db_escape_string($property_group),
serendipity_db_escape_string($useproperty_subgroup),
serendipity_db_escape_string($use_property_subgroup),
serendipity_db_escape_string($insert_key),
serendipity_db_escape_string($insert_val));
serendipity_db_query($q);
@ -2850,7 +2849,7 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
'nextIMG' => serendipity_getTemplateFile('admin/img/next.png'),
'token' => serendipity_setFormToken(),
'form_hidden' => $form_hidden,
'blimit_path' => basename($limit_path),
'blimit_path' => empty($smarty_vars['limit_path']) ? '':basename($smarty_vars['limit_path']),
'only_path' => $serendipity['GET']['only_path'],
'only_filename' => $serendipity['GET']['only_filename'],
'sortorder' => $serendipity['GET']['sortorder'],

2
include/functions_smarty.inc.php
View File

@ -584,7 +584,7 @@ function serendipity_smarty_refhookPlugin(&$eventData, $hook, $addData = null) {
// $serendipity['skip_smarty_hook'] = array('entries_header');
// That would only skip the entries_header event hook, but allow all others.
// Of course it cannot be used in conjunction with the all-blocking skip_smarty_hooks.
if (isset($serendipity['skip_smarty_hook']) && is_array($serendipity['skip_smarty_hook']) && isset($serendipity['skip_smarty_hook'][$params['hook']])) {
if (isset($serendipity['skip_smarty_hook']) && is_array($serendipity['skip_smarty_hook']) && isset($serendipity['skip_smarty_hook'][$hook])) {
return;
}

4
include/plugin_internal.inc.php
View File

@ -663,7 +663,7 @@ class serendipity_topreferrers_plugin extends serendipity_plugin {
} else {
$use_links = serendipity_db_bool($use_links);
}
echo serendipity_displayTopReferrers($this->get_config('limit', 10), $use_links, $this->get_config('interval', 7));
serendipity_displayTopReferrers($this->get_config('limit', 10), $use_links, $this->get_config('interval', 7));
}
}
@ -729,7 +729,7 @@ class serendipity_topexits_plugin extends serendipity_plugin {
$use_links = serendipity_db_bool($use_links);
}
echo serendipity_displayTopExits($this->get_config('limit', 10), $use_links, $this->get_config('interval', 7));
serendipity_displayTopExits($this->get_config('limit', 10), $use_links, $this->get_config('interval', 7));
}
}