mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
24 lines
829 B
Diff
24 lines
829 B
Diff
diff -urN phpldapadmin-1.2.1.1/lib/emuhash_functions.php phpldapadmin-1.2.1.1-new/lib/emuhash_functions.php
|
|
--- phpldapadmin-1.2.1.1/lib/emuhash_functions.php 2011-05-11 09:40:18.000000000 +0000
|
|
+++ phpldapadmin-1.2.1.1-new/lib/emuhash_functions.php 2011-10-20 15:55:05.597714125 +0000
|
|
@@ -59,8 +59,8 @@
|
|
global $emuhash_emu;
|
|
|
|
if (PHP_VERSION < 6) {
|
|
- $current_magic_quotes = @get_magic_quotes_runtime();
|
|
- @set_magic_quotes_runtime(0);
|
|
+ $current_magic_quotes = ini_get('magic_quotes_runtime');
|
|
+ ini_set('magic_quotes_runtime', 0);;
|
|
}
|
|
|
|
$tmpfile = tempnam($emuhash_emu['tmpdir'],'emuhash');
|
|
@@ -78,7 +78,7 @@
|
|
unlink($tmpfile);
|
|
|
|
if (PHP_VERSION < 6)
|
|
- @set_magic_quotes_runtime($current_magic_quotes);
|
|
+ ini_set('magic_quotes_runtime', $current_magic_quotes);
|
|
|
|
return $pass;
|
|
}
|