[bug] [33314] Fix Undefined variable: $originalOrders in com_tags

Close #3150
joomla · Apr 23, 2014 · 0cfc0ea · 0cfc0ea
1 parent 0da4c39
commit 0cfc0ea
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/administrator/components/com_categories/controllers/categories.php b/administrator/components/com_categories/controllers/categories.php
@@ -71,14 +71,18 @@ public function rebuild()
 	/**
 	 * Save the manual order inputs from the categories list page.
 	 *
-	 * @return  void
+	 * @return      void
 	 *
-	 * @since   1.6
+	 * @since       1.6
+	 * @see         JControllerAdmin::saveorder()
+	 * @deprecated  4.0
 	 */
 	public function saveorder()
 	{
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
+		JLog::add('CategoriesControllerCategories::saveorder() is deprecated. Function will be removed in 4.0', JLog::WARNING, 'deprecated');
+
 		// Get the arrays from the Request
 		$order = $this->input->post->get('order', null, 'array');
 		$originalOrder = explode(',', $this->input->getString('original_order_values'));

diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php
@@ -24,7 +24,6 @@
 $listDirn	= $this->escape($this->state->get('list.direction'));
 $ordering 	= ($listOrder == 'a.lft');
 $saveOrder 	= ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
-$originalOrders = array();
 
 if ($saveOrder)
 {
@@ -215,7 +214,6 @@
 		<input type="hidden" name="extension" value="<?php echo $extension; ?>" />
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
-		<input type="hidden" name="original_order_values" value="<?php echo implode($originalOrders, ','); ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php
@@ -61,10 +61,20 @@ public function rebuild()
 		}
 	}
 
+	/**
+	 * Save the manual order inputs from the menu items list view
+	 * 
+	 * @return      void
+	 * 
+	 * @see         JControllerAdmin::saveorder()
+	 * @deprecated  4.0
+	 */
 	public function saveorder()
 	{
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
+		JLog::add('MenusControllerItems::saveorder() is deprecated. Function will be removed in 4.0', JLog::WARNING, 'deprecated');
+
 		// Get the arrays from the Request
 		$order = $this->input->post->get('order', null, 'array');
 		$originalOrder = explode(',', $this->input->getString('original_order_values'));

diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php
@@ -24,7 +24,6 @@
 $ordering 	= ($listOrder == 'a.lft');
 $canOrder	= $user->authorise('core.edit.state',	'com_menus');
 $saveOrder 	= ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
-$originalOrders = array();
 
 if ($saveOrder)
 {
@@ -249,7 +248,6 @@
 
 		<input type="hidden" name="task" value="" />
 		<input type="hidden" name="boxchecked" value="0" />
-		<input type="hidden" name="original_order_values" value="<?php echo implode($originalOrders, ','); ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php
@@ -125,7 +125,6 @@
 				</tfoot>
 				<tbody>
 				<?php
-				$originalOrders = array();
 				foreach ($this->items as $i => $item) :
 					$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
 					$canCreate  = $user->authorise('core.create',     'com_tags');
@@ -232,7 +231,6 @@
 		<input type="hidden" name="boxchecked" value="0" />
 		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
 		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-		<input type="hidden" name="original_order_values" value="<?php echo implode($originalOrders, ','); ?>" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/templates/hathor/html/com_categories/categories/default.php b/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -116,7 +116,6 @@
 				</thead>
 
 				<tbody>
-					<?php $originalOrders = array(); ?>
 					<?php foreach ($this->items as $i => $item) : ?>
 						<?php
 						$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
@@ -159,7 +158,6 @@
 									<?php endif; ?>
 									<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
 									<input type="text" name="order[]" value="<?php echo $orderkey + 1; ?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
-									<?php $originalOrders[] = $orderkey + 1; ?>
 								<?php else : ?>
 									<?php echo $orderkey + 1; ?>
 								<?php endif; ?>
@@ -201,7 +199,6 @@
 			<input type="hidden" name="boxchecked" value="0" />
 			<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
 			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-			<input type="hidden" name="original_order_values" value="<?php echo implode($originalOrders, ','); ?>" />
 			<?php echo JHtml::_('form.token'); ?>
 		</div>
 	</form>

diff --git a/administrator/templates/hathor/html/com_menus/items/default.php b/administrator/templates/hathor/html/com_menus/items/default.php
@@ -134,7 +134,6 @@
 
 		<tbody>
 		<?php
-		$originalOrders = array();
 		foreach ($this->items as $i => $item) :
 			$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
 			$canCreate  = $user->authorise('core.create',     'com_menus');
@@ -180,7 +179,6 @@
 						<?php endif; ?>
 						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
 						<input type="text" name="order[]" value="<?php echo $orderkey + 1;?>" <?php echo $disabled ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
-						<?php $originalOrders[] = $orderkey + 1; ?>
 					<?php else : ?>
 						<?php echo $orderkey + 1;?>
 					<?php endif; ?>
@@ -244,7 +242,6 @@
 	<input type="hidden" name="boxchecked" value="0" />
 	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
 	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-	<input type="hidden" name="original_order_values" value="<?php echo implode($originalOrders, ','); ?>" />
 	<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>