|
From: OryNider <ory...@us...> - 2007-07-11 14:25:34
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28995/album_mod Modified Files: album_hierarchy_sql.php Log Message: This will readd the droped Jaime Lettering. Index: album_hierarchy_sql.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_hierarchy_sql.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** album_hierarchy_sql.php 5 Jul 2007 06:00:22 -0000 1.8 --- album_hierarchy_sql.php 11 Jul 2007 14:25:27 -0000 1.9 *************** *** 1,3 **** --- 1,12 ---- <?php + /** + * + * @package mxBB Portal Module - mx_smartor + * @version $Id$ + * @copyright (c) 2002-2006 [Smartor, Volodymyr (CLowN) Skoryk, IdleVoid, Jon Ohlsson] mxBB Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 + * + */ + /*************************************************************************** * album_hierarchy_sql.php *************** *** 12,24 **** /*************************************************************************** * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - ***************************************************************************/ - - /*************************************************************************** - * * This mod is strongly based on the Forum Hiearchy Category Mod by Ptirhiik * A lot of credit goes to Ptirhiik and ClowN --- 21,24 ---- *************** *** 76,80 **** function album_read_tree($user_id = ALBUM_PUBLIC_GALLERY, $options = ALBUM_AUTH_VIEW) { ! global $db, $album_data, $userdata; $can_view = (int) checkFlag($options, ALBUM_AUTH_VIEW); --- 76,80 ---- function album_read_tree($user_id = ALBUM_PUBLIC_GALLERY, $options = ALBUM_AUTH_VIEW) { ! global $db, $album_data, $userdata, $jaime_lettering; $can_view = (int) checkFlag($options, ALBUM_AUTH_VIEW); *************** *** 1074,1078 **** function album_build_picture_table($user_id, $cat_ids, $AH_thiscat, $auth_data, $start, $sort_method, $sort_order, $total_pics) { ! global $board_config, $album_data, $album_config, $album_sp_config, $template, $lang, $phpEx, $userdata, $db; if ( defined('IS_PHPBBXS') ) { --- 1074,1078 ---- function album_build_picture_table($user_id, $cat_ids, $AH_thiscat, $auth_data, $start, $sort_method, $sort_order, $total_pics) { ! global $board_config, $album_data, $album_config, $album_sp_config, $template, $lang, $phpEx, $userdata, $db, $jaime_lettering; if ( defined('IS_PHPBBXS') ) { *************** *** 1117,1120 **** --- 1117,1121 ---- LEFT JOIN ". ALBUM_CAT_TABLE ." AS ct ON p.pic_cat_id = ct.cat_id WHERE p.pic_cat_id IN ($cat_ids) $pic_approval_sql + $jaime_lettering GROUP BY p.pic_id ORDER BY $sort_method $sort_order |