|
From: Florin C B. <ory...@us...> - 2013-03-18 05:51:49
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4712/album_mod/modules Modified Files: album_picm.php Log Message: database schema upgrade for mx_smartor 3.0 and FAP 1.5.0 plus some files Index: album_picm.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_picm.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_picm.php 8 Nov 2011 07:17:16 -0000 1.8 --- album_picm.php 18 Mar 2013 05:51:46 -0000 1.9 *************** *** 56,60 **** { //$sql = "SELECT * FROM " . ALBUM_TABLE . " WHERE pic_id = '$pic_id'"; - // ------------------------------------ // Get this pic info and current Category Info --- 56,59 ---- *************** *** 65,69 **** AND c.cat_id = p.pic_cat_id LIMIT 1"; - if (!($result = $db->sql_query($sql))) { --- 64,67 ---- *************** *** 105,109 **** $pic_info = array(); ! $pic_info = (@function_exists('mx_message_die')) ? @pic_info($thispic['pic_filename'], $thispic['pic_thumbnail'], $thispic['pic_title']) : false; $apply_wm = false; --- 103,107 ---- $pic_info = array(); ! $pic_info = pic_info($thispic['pic_filename'], $thispic['pic_thumbnail'], $thispic['pic_title']); $apply_wm = false; *************** *** 118,124 **** } ! if( empty($thispic) or !file_exists(ALBUM_UPLOAD_PATH . $pic_filename) ) { ! die($lang['Pic_not_exist']); } --- 116,122 ---- } ! if(empty($thispic) or !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_info['fullpath']); } *************** *** 140,144 **** if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']); } --- 138,142 ---- if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath'])) { ! mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist'] . ': ' . $pic_fullpath); } |