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

Repair ML-Upload in editor

Browse Source 
Change function-comments according to the new logic
This commit is contained in:
onli 2013-06-16 14:13:51 +02:00
parent 7a8b5e755f
commit 2af76d2e69
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions_images.inc.php
View File

@ -1441,7 +1441,7 @@ function serendipity_calculate_aspect_size($width, $height, $size, $constraint =
* @param string The URL to use for pagination
* @param boolean Show the "upload media item" feature?
* @param boolean Restrict viewing images to a specific directory
* @return string Smarty block name
* @return string Generated HTML
*/
function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false, $limit_path = NULL) {
global $serendipity;
@ -2238,7 +2238,7 @@ function &serendipity_getImageData($sRelativePath) {
* @param array Associative array holding an array('image_id', 'target', 'created_thumbnail') that points to the uploaded media
* @param int How many keyword checkboxes to display next to each other?
* @param boolean Can existing data be modified?
* @return boolean
* @return string Generated HTML
*
*/
function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_edit = true) {
@ -2807,7 +2807,7 @@ function serendipity_prepareMedia(&$file, $url = '') {
* @param int how many media items to display per row
* @param boolean Enclose within a table cell?
* @param array Additional Smarty variables
* @return string Smarty block name
* @return string Generated HTML
*
*/
function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lineBreak = 3, $enclose = true, $smarty_vars = array()) {
@ -2885,8 +2885,6 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin
$block = 'admin/media_properties.tpl';
return serendipity_smarty_show(serendipity_getTemplateFile('admin/media_properties.tpl', 'serendipityPath'));
}
return $block;
}
/**

8
serendipity_admin_image_selector.php
View File

@ -288,8 +288,8 @@ switch ($serendipity['GET']['step']) {
$serendipity['thumbPerPage2'] = 3;
}
ob_start();
$block = serendipity_displayImageList(
$media['external'] = serendipity_displayImageList(
isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1,
$serendipity['thumbPerPage2'],
($serendipity['showMediaToolbar'] ? true : false),
@ -298,9 +298,7 @@ switch ($serendipity['GET']['step']) {
null,
false
);
$media['external'] = ob_get_contents();
ob_end_clean();
serendipity_smarty_fetch('MEDIA_LIST', $block);
serendipity_smarty_fetch('MEDIA_LIST', "admin/media_pane.tpl");
}
$media = array_merge($serendipity['GET'], $media);