diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 18 | ||||
| -rw-r--r-- | admin/plugins_list.php | 6 | ||||
| -rw-r--r-- | include/functions_search.inc.php | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index a41cb7e02..42ed056b6 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -247,7 +247,7 @@ SELECT { update_category($category_ids); } - + trigger_action('delete_elements', $ids); } @@ -920,7 +920,7 @@ SELECT DISTINCT(storage_category_id) { $query = ' UPDATE '.IMAGES_TABLE.' - SET path = '.pwg_db_concat(array($fulldirs[$cat_id],'\'/\'','file')).' + SET path = '.pwg_db_concat(array("'".$fulldirs[$cat_id]."/'",'file')).' WHERE storage_category_id = '.$cat_id.' ;'; pwg_query($query); @@ -1292,7 +1292,7 @@ DELETE */ function add_tags($tags, $images) { - if (count($tags) == 0 or count($tags) == 0) + if (count($tags) == 0 or count($images) == 0) { return; } @@ -1903,7 +1903,7 @@ function get_active_menu($menu_page) return 0; } } - + switch ($menu_page) { case 'photos_add': @@ -1923,7 +1923,7 @@ function get_active_menu($menu_page) case 'cat_perm': case 'permalinks': return 1; - + case 'user_list': case 'user_perm': case 'group_list': @@ -1936,7 +1936,7 @@ function get_active_menu($menu_page) case 'plugins_new': case 'plugin': return 3; - + case 'stats': case 'history': case 'maintenance': @@ -1971,7 +1971,7 @@ function get_fckb_taglist($query) ) ); } - + return $taglist; } @@ -1983,7 +1983,7 @@ function get_fckb_tag_ids($raw_tags) // or "1234" (numeric characters only) $tag_ids = array(); - + foreach ($raw_tags as $raw_tag) { if (preg_match('/^~~(\d+)~~$/', $raw_tag, $matches)) @@ -1994,7 +1994,7 @@ function get_fckb_tag_ids($raw_tags) { // we have to create a new tag array_push( - $tag_ids, + $tag_ids, tag_id_from_tag_name($raw_tag) ); } diff --git a/admin/plugins_list.php b/admin/plugins_list.php index 89fa4c6dd..0e0076a56 100644 --- a/admin/plugins_list.php +++ b/admin/plugins_list.php @@ -39,7 +39,7 @@ $plugins = new plugins(); if (isset($_GET['action']) and isset($_GET['plugin']) and !is_adviser()) { check_pwg_token(); - + $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']); if (empty($page['errors'])) @@ -69,7 +69,7 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin) 'VERSION' => $fs_plugin['version'], 'DESC' => $fs_plugin['description'], 'AUTHOR' => $fs_plugin['author'], - 'AUTHOR_URL' => $fs_plugin['author uri'], + 'AUTHOR_URL' => @$fs_plugin['author uri'], 'U_ACTION' => sprintf($action_url, $plugin_id) ); @@ -112,6 +112,6 @@ if (count($missing_plugin_ids) > 0) { $template->append('plugin_states', 'missing'); } - + $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); ?>
\ No newline at end of file diff --git a/include/functions_search.inc.php b/include/functions_search.inc.php index ad9c5699b..8f6af51dd 100644 --- a/include/functions_search.inc.php +++ b/include/functions_search.inc.php @@ -252,7 +252,7 @@ SELECT DISTINCT(id) } else { - $items = array_intersect($items, $tag_items); + $items = array_values( array_intersect($items, $tag_items) ); } break; case 'OR': |