Merge branch 'release/1.0.6'

fuel/application/config/hooks.php

@@ -17,7 +17,7 @@
 								'filename' => 'Test_hooks.php',
 								'filepath' => 'hooks',
 								'params'   => array(),
-								'module' => 'app',
+								'module' => 'app');
 */
 // include hooks specific to FUEL
 include(FUEL_PATH.'config/fuel_hooks.php');

fuel/application/views/_install.php

@@ -141,7 +141,7 @@
 
 
 							<ul class="bullets">
-								<li>Need help? Visit the <a href="http://forums.getfuelcms.com" target="_blank">FUEL CMS Forums</a>.</li>
+								<li>Need help? Visit the <a href="http://forum.getfuelcms.com" target="_blank">FUEL CMS Forum</a>.</li>
 								<li>Found a bug? <a href="https://github.com/daylightstudio/FUEL-CMS/issues" target="_blank">Report it on GitHub</a>.</li>
 								<li>Subscribe to our <a href="http://twitter.com/fuelcms">Twitter feed</a> for FUEL CMS notifications.</li>
 								<li>Visit our <a href="http://twitter.com/blog" target="_blank">blog</a> for tips and news.</li>

fuel/modules/fuel/assets/js/fuel/controller/AssetsController.js

@@ -27,6 +27,10 @@ fuel.controller.AssetsController = jqx.createController(fuel.controller.BaseFuel
 			$assetSelect.change(function(e){
 				$assetPreview.html('<img src="' + jqx.config.assetsPath + selectedAssetFolder + '/' + $assetSelect.val() + '" />');
 			})
+			$assetSelect.keyup(function(e) {
+				$assetSelect.change();
+				return(false);
+			});
 			$assetSelect.change();
 			$('.img_only').show();
 		} else {

fuel/modules/fuel/assets/js/fuel/controller/BaseFuelController.js

@@ -485,7 +485,7 @@ fuel.controller.BaseFuelController = jqx.lib.BaseController.extend({
 		});
 
 		//$('#form input:first').select();
-		$('input,textarea', '#form').filter(':first').focus();
+		$(':input', '#form').filter(':first').focus();
 
 		if (jqx.config.warnIfModified) $.checksave('#fuel_main_content');
 	},

fuel/modules/fuel/assets/js/fuel/custom_fields.js

@@ -72,6 +72,7 @@ fuel.fields.multi_field = function(context, inline_edit){
 
 // markItUp! and CKeditor field
 fuel.fields.wysiwyg_field = function(context){
+
 	$editors = $ckEditor = $('textarea', context).not('.no_editor, .markItUpEditor');
 	var module = fuel.getModule();
 	var _previewPath = myMarkItUpSettings.previewParserPath;
@@ -319,7 +320,6 @@ fuel.fields.wysiwyg_field = function(context){
 
 		// add preview to make it noticable and consistent
 		if ($textarea.parent().find('.editor_preview').length == 0){
-
 			var $previewBtn = $textarea.parent('.markItUpContainer').find('.markItUpHeader .preview');
 			if ($previewBtn){
 				$textarea.parent().append(previewButton);
@@ -884,6 +884,7 @@ fuel.fields.template_field = function(context, options){
 			options.min = $attrElem.attr('data-min');
 			options.dblClickBehavior = $attrElem.attr('data-dblclick');
 			options.initDisplay = $attrElem.attr('data-init_display');
+			options.removeable = $attrElem.attr('data-removeable');
 			options.addButtonText = fuel.lang('btn_add_another');
 			options.removeButtonText = fuel.lang('btn_remove');
 			options.warnBeforeDeleteMessage = fuel.lang('warn_before_delete_msg');

fuel/modules/fuel/assets/js/jquery/plugins/jquery.repeatable.js

@@ -28,7 +28,8 @@ [email protected]
 			max : null,
 			min : null,
 			depth : 1,
-			allowCollapsingContent : true
+			allowCollapsingContent : true,
+			removeable : true
 		}, o || {});
 
 		// used for issue when renaming checkboxes
@@ -148,6 +149,7 @@ [email protected]
 		}
 
 		var createRemoveButton = function(elem){
+			if (!options.removeable) return;
 			$elem = $(elem);
 			if (!$elem.find('.' + options.removeButtonClass).length) {
 				var $remove = $elem.find(options.removeSelector + ':first');

fuel/modules/fuel/config/fuel_constants.php

@@ -1,6 +1,6 @@
 <?php 
 // INSTALL_ROOT is defined in the index.php bootstrap file
-define('FUEL_VERSION', '1.0.5');
+define('FUEL_VERSION', '1.0.6');
 define('MODULES_FOLDER', '../modules');
 define('FUEL_FOLDER', 'fuel');
 define('MODULES_PATH', APPPATH.MODULES_FOLDER.'/');

fuel/modules/fuel/controllers/blocks.php

@@ -87,6 +87,7 @@ public function upload($inline = FALSE)
 				'application/php', 
 				'application/x-php', 
 				'text/php', 
+				'text/html', 
 				'text/x-php', 
 				'application/x-httpd-php-source', 
 				'text/plain');

fuel/modules/fuel/controllers/module.php

@@ -320,7 +320,7 @@ function items()
 				$edit_func .= 'if (isset($cols[$CI->model->key_field()]))
 				{
 					$url = fuel_url("'.$this->module_uri.'/edit/".$cols[$CI->model->key_field()]);
-					$link = "<a href=\"".$url."\">".lang("table_action_delete")."</a>";
+					$link = "<a href=\"".$url."\" class=\"action_delete\">".lang("table_action_delete")."</a>";
 					$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
 				}';	
 			}
@@ -338,7 +338,7 @@ function items()
 				$delete_func .= 'if (isset($cols[$CI->model->key_field()]))
 				{
 					$url = fuel_url("'.$this->module_uri.'/delete/".$cols[$CI->model->key_field()]);
-					$link = "<a href=\"".$url."\">".lang("table_action_delete")."</a>";
+					$link = "<a href=\"".$url."\" class=\"action_delete\">".lang("table_action_delete")."</a>";
 					$link .= " <input type=\"checkbox\" name=\"delete[".$cols[$CI->model->key_field()]."]\" value=\"1\" id=\"delete_".$cols[$CI->model->key_field()]."\" class=\"multi_delete\"/>";
 				}';				
 			}
@@ -2174,6 +2174,9 @@ protected function _process_upload_data($field_name, $uploaded_data, $posted)
 				{
 
 					$data[$field_name] = $val['file_name'];
+
+					// reset any validation to prevent issues with saving again (e.g. unique fields and the is_new function is problematic)
+					$this->model->remove_all_validation($data);
 					$this->model->save($data);
 				}
 			}

fuel/modules/fuel/controllers/pages.php

@@ -243,8 +243,9 @@ public function _form($id = NULL)
 
 		$field_values = (!empty($_POST)) ? $_POST : $saved;
 		$field_values['layout'] = $layout;
-
-		if (!empty($field_values['location'])) $this->preview_path = $field_values['location'];
+
+		// substitute data values into preview path
+		$this->preview_path = $this->module_obj->url($field_values);
 
 		$sort_arr = (empty($fields['navigation_label'])) ? array('location', 'layout', 'published', 'cache') : array('location', 'layout', 'navigation_label', 'published', 'cache');
 
@@ -377,10 +378,10 @@ public function _form($id = NULL)
 
 		// page variables
 		$layout =  $this->fuel->layouts->get($layout);
-		$layout->set_field_values($page_vars);
 
 		if (!empty($layout))
 		{
+			$layout->set_field_values($page_vars);
 			$fields = $layout->fields();
 			$import_field = $layout->import_field();
 		}
@@ -390,6 +391,9 @@ public function _form($id = NULL)
 			$this->js_controller_params['import_field'] = $import_field;
 		}
 
+		// since the form builder is cleared above, we'll add in a script tag to make sure that the initialize code gets executed again
+		$this->form_builder->add_js('<script></script>');
+
 		$this->form_builder->id = 'layout_fields';
 		$this->form_builder->name_prefix = 'vars';
 		$this->form_builder->set_fields($fields);
@@ -928,7 +932,8 @@ public function upload()
 				'application/x-httpd-php', 
 				'application/php', 
 				'application/x-php', 
-				'text/php', 
+				'text/php',
+				'text/html', 
 				'text/x-php', 
 				'application/x-httpd-php-source', 
 				'text/plain');

fuel/modules/fuel/core/MY_DB_mysql_driver.php

@@ -341,7 +341,7 @@ public function load_sql($sql_path, $is_path = TRUE)
 		$use_sql = 'USE '.$db;
 
 		$CI->db->query($use_sql);
-		$sql_arr = explode(";\n", $sql);
+		$sql_arr = explode(";\n", str_replace("\r\n", "\n", $sql));
 		foreach($sql_arr as $s)
 		{
 			$s = trim($s);
@@ -353,4 +353,4 @@ public function load_sql($sql_path, $is_path = TRUE)
 	}
 }
 /* End of file MY_DB_mysql_driver.php */
-/* Location: ./application/libraries/MY_DB_mysql_driver.php */
+/* Location: ./application/libraries/MY_DB_mysql_driver.php */

fuel/modules/fuel/helpers/MY_url_helper.php

@@ -284,7 +284,8 @@ function link_target($link, $exts = array())
 	{
 		$exts = array($exts);
 	}
-	$ext = end(explode('.', $link));
+	$link_parts = explode('.', $link);
+	$ext = end($link_parts);
 
 	// check if an http path and that it is from a different domain
 	if (is_http_path($link) AND $test_domain != $domain OR (!empty($exts) AND in_array($ext, $exts)))

fuel/modules/fuel/libraries/Data_table.php

@@ -942,7 +942,7 @@ protected function _render_actions($actions, $fields)
 
 
 				$attrs = (!empty($val['attrs'])) ? ' '.$this->_render_attrs($val['attrs']) : '';
-				$actions[] ='<a href="'.$url.'"'.$attrs.'>'.$key.'</a>';
+				$actions[] ='<a href="'.$url.'"'.$attrs.' class="action_'.url_title($key, 'underscore', TRUE).'">'.$key.'</a>';
 			}
 		}