Skip to content

Reworked imageFetchInfo() … #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bloke merged 8 commits into from
Mar 16, 2017
Merged

Reworked imageFetchInfo() … #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4aa9fc3
Reworked imageFetchInfo() to include logic duplicated across image_da…
jsoo Mar 6, 2017
7b78ff3
image_author(): added id and name attributes
jsoo Mar 6, 2017
8af2767
Refactored image() and thumbnail() to use imageFetchInfo(). (NB: this…
jsoo Mar 6, 2017
25492ac
Merge branch 'dev' into image-tag-refactor
jsoo Mar 7, 2017
c9cbf1c
Deprecated image_display() and image_index(); use image() and images(…
jsoo Mar 7, 2017
3a85a3f
thumbnail(): deprecated the 'poplink' attribute.
jsoo Mar 7, 2017
a1fee93
After previous (c9cbf1c) commit, image_index() no longer needs to dec…
jsoo Mar 7, 2017
950b1c3
allow image_url() to temporarily change global; code cleaning in ima…
jsoo Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions textpattern/lib/txplib_misc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,22 +954,55 @@ function image_data($file, $meta = array(), $id = 0, $uploaded = true)
/**
* Gets an image as an array.
*
* @param string $where SQL where clause
* @return array|bool An image data, or FALSE on failure
* @param int $id image ID
* @param string $name image name
* @return array|bool An image data array, or FALSE on failure
* @package Image
* @example
* if ($image = fileDownloadFetchInfo('id = 1'))
* if ($image = imageFetchInfo($id))
* {
* print_r($image);
* }
*/

function imageFetchInfo($where)
function imageFetchInfo($id = "", $name = "")
{
global $thisimage, $p;
static $cache = array();

if ($id) {
if (isset($cache['i'][$id])) {
return $cache['i'][$id];
} else {
$where = 'id = '.intval($id).' LIMIT 1';
}
} elseif ($name) {
if (isset($cache['n'][$name])) {
return $cache['n'][$name];
} else {
$where = "name = '".doSlash($name)."' LIMIT 1";
}
} elseif ($thisimage) {
$id = (int) $thisimage['id'];
return $cache['i'][$id] = $thisimage;
} elseif ($p) {
if (isset($cache['i'][$p])) {
return $cache['i'][$p];
} else {
$where = 'id = '.intval($p).' LIMIT 1';
}
} else {
assert_image();
return false;
}

$rs = safe_row("*", 'txp_image', $where);

if ($rs) {
return image_format_info($rs);
$id = (int) $rs['id'];
return $cache['i'][$id] = image_format_info($rs);
} else {
trigger_error(gTxt('unknown_image'));
}

return false;
Expand Down
Loading