vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified : photos search issue fixed

Browse source
This commit is contained in:
Fahad Abbas 2017-03-20 12:45:19 +05:00
parent d3d068e978
commit 82241d2349
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
upload/includes/classes/photos.class.php
View file

@ -15,7 +15,6 @@
class CBPhotos
{
var $action = '';
var $action_ = '';
var $collection = '';
var $p_tbl = "photos";
var $i_tbl = "collection_items";
@ -260,7 +259,7 @@ class CBPhotos
{
$this->search = new cbsearch;
$this->search->db_tbl = "photos";
$this->search->use_match_method = TRUE;
$this->search->use_match_method = FALSE;
$this->search->columns = array(
array("field"=>"photo_title","type"=>"LIKE","var"=>"%{KEY}%"),
@ -572,11 +571,6 @@ class CBPhotos
{
$query = $main_query;
if ( $cond ) {
if (!has_access("admin_access")) {
// get collections that are either not private or created by logged in user
$cond .= " AND collections.broadcast != 'private' OR collections.userid = 'userid()'";
}
$query .= " WHERE ".$cond;
}
@ -585,7 +579,7 @@ class CBPhotos
$result = select( $query );
}
if($p['show_related'])
{
$query = $main_query;
@ -620,7 +614,7 @@ class CBPhotos
$query .= $limit;
$result = select( $query );
// We found nothing from TITLE of Photos, let's try TAGS
if($db->num_rows == 0)
{
@ -2911,4 +2905,4 @@ class CBPhotos
}
?>
?>

7
upload/styles/global/upload_form.html
View file

@ -24,13 +24,12 @@
</div>
<div id="uploadDataContainer" class="uploadDataContainer hidden">
<div class="uploadingProgressContainer">
</div>
<div class="realProgressBars">
<div class="alert alert-block alert-info">
<p><b>{lang code="selected_files"} </b>{lang code="upload_in_progress"} <small style="color:white;"><span id="progressNumber">0%</span> {lang code="complete_of_video"} <span id="videoNumber"></span></small></p>
</div>
</div>
<div class="align-right hidden" id="uploadMore">
<a href="#" class="btn btn-primary uploadMoreVideos" id="uploadMoreVideos">{lang code="upload_more_videos"}</a>
</div>
<div id="files"></div>
<div id="allUploadForms" class="tab-content allUploadForms"></div>