summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlsces <lester@lsces.co.uk>2015-01-22 10:25:18 +0000
committerlsces <lester@lsces.co.uk>2015-01-22 10:25:18 +0000
commitc8bf9217884c10f8d1ef9dad62a092537b1da8db (patch)
tree19479d45ebb1b3124598b1364af28174c0062ebe
parent33dd12e19a85783f91db793dc676fafcfef993c9 (diff)
parent2990913981932fa7d173f839b40ff5cd5b60cd94 (diff)
downloadarticles-c8bf9217884c10f8d1ef9dad62a092537b1da8db.tar.gz
articles-c8bf9217884c10f8d1ef9dad62a092537b1da8db.tar.bz2
articles-c8bf9217884c10f8d1ef9dad62a092537b1da8db.zip
Merge
-rw-r--r--admin/upgrade_inc.php2
-rw-r--r--templates/edit_topic.tpl4
2 files changed, 3 insertions, 3 deletions
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 2405e86..5519ad2 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -74,7 +74,7 @@ array( 'PHP' => '
$storeRow["user_id"],
));
- $storeRow["upload"]["dest_file_path"] = liberty_process_upload( $storeRow );
+ $storeRow["upload"]["dest_file_path"] = liberty_process_upload( $storeRow[\'upload\'] );
$sql = "INSERT INTO `'.BIT_DB_PREFIX.'liberty_attachments` ( `content_id`, `attachment_id`, `attachment_plugin_guid`, `foreign_id`, `user_id` ) VALUES ( ?, ?, ?, ?, ? )";
$rs = $gBitSystem->mDb->query( $sql, array( $storeRow["content_id"], $storeRow["attachment_id"], $storeRow["plugin_guid"], (int)$storeRow["foreign_id"], $storeRow["user_id"] ) );
diff --git a/templates/edit_topic.tpl b/templates/edit_topic.tpl
index b00847a..08e6b6c 100644
--- a/templates/edit_topic.tpl
+++ b/templates/edit_topic.tpl
@@ -23,10 +23,10 @@
</div>
<div class="form-group">
- <label class="checkbox">
+ {forminput label="checkbox"}
<input type="checkbox" id="topic_enabled" name="active_topic" {if $gContent->mInfo.active_topic == 'y'}checked="checked"{/if} />Topic Enabled
{formhelp note=""}
- </label>
+ {/forminput}
</div>
<div class="form-group">