<?xml version="1.0" encoding="utf-8" ?><rss version="2.0"><channel><title><![CDATA[black521devil的专栏]]></title><description><![CDATA[]]></description><link>https://blog.youkuaiyun.com/black521devil</link><language>zh-cn</language><generator>https://blog.youkuaiyun.com/</generator><copyright><![CDATA[Copyright &copy; black521devil]]></copyright><item><title><![CDATA[git分支的合并]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/27335881</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/27335881</guid><author>black521devil</author><pubDate>Wed, 28 May 2014 14:38:06 +0800</pubDate><description><![CDATA[原文 http://gitbook.liuhui998.com/3_3.html


一、如何分支的合并

在git中，可以使用git merge 和git rebase两个命令来进行分支的合并。

git merge 和git rebase在大体上都差不多，下文主要以git
 merge来例来讲解分支的合并流程。

如果你想了解分支合并的更多内容，请阅读《git
 merg]]></description><category></category></item><item><title><![CDATA[mysql密码忘记，怎么办？]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17577849</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17577849</guid><author>black521devil</author><pubDate>Thu, 26 Dec 2013 10:29:18 +0800</pubDate><description><![CDATA[Windows

1.用系统管理员登陆系统；

2.停止MySQL的服务；

3.进入命令窗口，然后进入MySQL的安装目录，比如我的安装目录是c:\mysql，进入C:\mysql\bin；

4.跳过权限检查启动MySQL

c:\mysql\bin>mysqld-nt --skip-grant-tables

5.重新打开一个窗口，进入c:\mysql\bin目录，设]]></description><category></category></item><item><title><![CDATA[php导入excel文件]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505469</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505469</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:29:41 +0800</pubDate><description><![CDATA[header("Content-Type:text/html; charset=utf-8");
define('IN_ECS', true);
require(dirname(__FILE__) . '/includes/init.php');
require_once(ROOT_PATH . '/includes/lib_order.php');
require_once './jde]]></description><category></category></item><item><title><![CDATA[获取type=file的value各个浏览器兼容]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505291</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505291</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:21:50 +0800</pubDate><description><![CDATA[方法是网上搜集的，通过测试，火狐貌似还是不行。

//FX获取文件路径方法
function readFileFirefox(fileBrowser) {
    try {
        netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
    } 
    catch (e) {]]></description><category></category></item><item><title><![CDATA[apache开启伪静态]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505235</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505235</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:20:15 +0800</pubDate><description><![CDATA[找到Apache的安装目录，找到conf/httpd.conf 中搜索如下一段代码：


LoadModule Rewrite_module modules/mod_Rewrite.so


去掉该代码的最前面的#注释


搜索AllowOverride None 替换为 AllowOverride All


重启apache即可实现伪静态。


测试通过，没有问题]]></description><category></category></item><item><title><![CDATA[php防止sql注入，字符串变量检查]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505207</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505207</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:18:40 +0800</pubDate><description><![CDATA[//判断字符串是否含有sql
function inject_check($get_code){
    return eregi('select|insert|update|dalete|\'|\/\*|\.\.\/|union|into|load_file|outfile',$sql_str);
}
//过滤字符串
function str_check($str){
if(!get]]></description><category></category></item><item><title><![CDATA[php中fun($param)和fun（&$param）的区别]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505157</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505157</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:15:12 +0800</pubDate><description><![CDATA[首先你要明白指针的概念,不过php的指针和c的指针有一些不同
$a = $b;
是把$b的值赋值给$a,如果赋值后,$b的值改变了,$a的值是不会改变的


$a =&$b;
这个是把$b的地址传递给$a,这个时候,$a和$b都指向内存中的同一块地址,所以如果赋值后,你改变了$b的值,$a的值也是会改变的


举个例子
$b = 1;
$a = $b;
$b = 2;
e]]></description><category></category></item><item><title><![CDATA[php中$GLOBALS和global的区别]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505145</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505145</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:14:43 +0800</pubDate><description><![CDATA[1、$GLOBALS是由所有已定义全局变量自动形成的数组。变量名就是该数组的索引。即$GLOBALS['var1']与函数外部的变量$var1是同一个变量，所以将$GLOBALS['var1'] 删除后，该变量已不存在，所有无法输出了。
注：$GLOBALS是自动全局变量。这意味着它在所有的脚本中都有效。在函数或方法中不需要使用 global $GLOBALS; 来访问它。


2、"gl]]></description><category></category></item><item><title><![CDATA[mysql 省级数据库，市级数据库。]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505119</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505119</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:13:38 +0800</pubDate><description><![CDATA[DROP TABLE IF EXISTS `province`; CREATE TABLE `province` (`id` int(11) NOT NULL AUTO_INCREMENT,`name` varchar(50) DEFAULT NULL,PRIMARY KEY (`id`)) ENGINE=MyISAM AUTO_INCREMENT=36 ;
INSERT INTO `provi]]></description><category></category></item><item><title><![CDATA[mysql数据库，两个数据库之间的链表查询]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505081</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505081</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:12:42 +0800</pubDate><description><![CDATA[select a.wordA from `databaseA`.tableA a ,`databaseB`.tableB b where a.wordA=b.wordB;


测过 运行没得问题
那个引号是反单引号
键盘tab上面那一个按钮。]]></description><category></category></item><item><title><![CDATA[zend studio中ctrl+鼠标左键无法转到类或函数定义文件]]></title><link>https://blog.youkuaiyun.com/black521devil/article/details/17505033</link><guid>https://blog.youkuaiyun.com/black521devil/article/details/17505033</guid><author>black521devil</author><pubDate>Mon, 23 Dec 2013 15:09:59 +0800</pubDate><description><![CDATA[zend studio中ctrl+鼠标左键无法转到类或函数定义文件
zendstudio 无法ctrl+左键跳转到函数源代码是创建工程的方式造成的,很有可能是把先前存在的工程以file的形式导入,zendstudio就把工程当作文档来处理了
解决方法：右键点击工程->configure->add php support 。重新编译后即可。
如果你想要zendstudio支持javascript的语]]></description><category></category></item></channel></rss>