change system

HackGen · Oct 19, 2013 · b6be121 · b6be121
1 parent d37f60a
commit b6be121
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 38 deletions.
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
@@ -33,11 +33,7 @@
  * @var string
  *
  */
-<<<<<<< HEAD
-	define('CI_VERSION', '2.1.3');
-=======
 	define('CI_VERSION', '2.1.4');
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 
 /**
  * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)

diff --git a/system/core/Security.php b/system/core/Security.php
@@ -619,19 +619,6 @@ protected function _remove_evil_attributes($str, $is_image)
 			$count = 0;
 			$attribs = array();
 
-<<<<<<< HEAD
-			// find occurrences of illegal attribute strings without quotes
-			preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER);
-
-			foreach ($matches as $attr)
-			{
-
-				$attribs[] = preg_quote($attr[0], '/');
-			}
-
-			// find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
-			preg_match_all("/(".implode('|', $evil_attributes).")\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is",  $str, $matches, PREG_SET_ORDER);
-=======
 			// find occurrences of illegal attribute strings with quotes (042 and 047 are octal quotes)
 			preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*(\042|\047)([^\\2]*?)(\\2)/is', $str, $matches, PREG_SET_ORDER);
 
@@ -642,7 +629,6 @@ protected function _remove_evil_attributes($str, $is_image)
 
 			// find occurrences of illegal attribute strings without quotes
 			preg_match_all('/('.implode('|', $evil_attributes).')\s*=\s*([^\s>]*)/is', $str, $matches, PREG_SET_ORDER);
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 
 			foreach ($matches as $attr)
 			{
@@ -652,11 +638,7 @@ protected function _remove_evil_attributes($str, $is_image)
 			// replace illegal attribute strings that are inside an html tag
 			if (count($attribs) > 0)
 			{
-<<<<<<< HEAD
-				$str = preg_replace("/<(\/?[^><]+?)([^A-Za-z<>\-])(.*?)(".implode('|', $attribs).")(.*?)([\s><])([><]*)/i", '<$1 $3$5$6$7', $str, -1, $count);
-=======
 				$str = preg_replace('/(<?)(\/?[^><]+?)([^A-Za-z<>\-])(.*?)('.implode('|', $attribs).')(.*?)([\s><]?)([><]*)/i', '$1$2 $4$6$7$8', $str, -1, $count);
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 			}
 
 		} while ($count);
@@ -890,8 +872,4 @@ protected function _csrf_set_hash()
 }
 
 /* End of file Security.php */
-<<<<<<< HEAD
-/* Location: ./system/libraries/Security.php */
-=======
 /* Location: ./system/libraries/Security.php */
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
@@ -1404,11 +1404,7 @@ public function set_update_batch($key, $index = '', $escape = TRUE)
 				}
 				else
 				{
-<<<<<<< HEAD
-					$not[] = $k.'-'.$v;
-=======
 					$not[] = $k2.'-'.$v2;
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 				}
 
 				if ($escape === FALSE)

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
@@ -1954,11 +1954,7 @@ public function print_debugger()
 			}
 		}
 
-<<<<<<< HEAD
-		$msg .= "<pre>".$this->_header_str."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
-=======
 		$msg .= "<pre>".htmlspecialchars($this->_header_str)."\n".htmlspecialchars($this->_subject)."\n".htmlspecialchars($this->_finalbody).'</pre>';
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 		return $msg;
 	}
 

diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
@@ -220,11 +220,7 @@ public function latest()
 	{
 		if ( ! $migrations = $this->find_migrations())
 		{
-<<<<<<< HEAD
-			$this->_error_string = $this->line->lang('migration_none_found');
-=======
 			$this->_error_string = $this->lang->line('migration_none_found');
->>>>>>> d1a856c6ad8281e9fd3658d43fc21763589244ec
 			return false;
 		}